diff options
| author | Miles Bader <miles@gnu.org> | 2006-08-03 05:10:38 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-08-03 05:10:38 +0000 |
| commit | 2e3ef421a9e7888ed48241bbeecedaeefb58ab54 (patch) | |
| tree | d7a59eb24269a42164aff762ed8b4c952293cdac /lisp/erc/erc.el | |
| parent | 6b2fcbb546b8b69b2eef40c5042439d3f822bec7 (diff) | |
| download | emacs-2e3ef421a9e7888ed48241bbeecedaeefb58ab54.tar.gz emacs-2e3ef421a9e7888ed48241bbeecedaeefb58ab54.tar.bz2 emacs-2e3ef421a9e7888ed48241bbeecedaeefb58ab54.zip | |
Merge from erc--emacs--21
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-379
Creator: Michael Olson <mwolson@gnu.org>
Diffstat (limited to 'lisp/erc/erc.el')
| -rw-r--r-- | lisp/erc/erc.el | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index fd5a49eae4b..4317b831d56 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -67,7 +67,7 @@ ;;; Code: -(defconst erc-version-string "Version 5.1.3" +(defconst erc-version-string "Version 5.1.4" "ERC version. This is used by function `erc-version'.") (eval-when-compile (require 'cl)) @@ -1243,7 +1243,11 @@ With arg, turn ERC %S mode on if and only if arg is positive. (format "erc-%s-mode" (downcase (symbol-name alias))))) (quote - ,mode)))))) + ,mode))) + ;; For find-function and find-variable. + (put ',mode 'definition-name ',name) + (put ',enable 'definition-name ',name) + (put ',disable 'definition-name ',name)))) (put 'define-erc-module 'doc-string-elt 3) @@ -1388,8 +1392,8 @@ server buffer") Defaults to the server buffer." (with-current-buffer (erc-server-buffer) (if (buffer-live-p erc-active-buffer) - erc-active-buffer) - (setq erc-active-buffer (current-buffer)))) + erc-active-buffer + (setq erc-active-buffer (current-buffer))))) (defun erc-set-active-buffer (buffer) "Set the value of `erc-active-buffer' to BUFFER." |