[Emacs-diffs] Changes to emacs/lisp/erc/erc.el,v

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     06/12/13 02:36:31

Index: erc.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/erc/erc.el,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- erc.el      8 Dec 2006 07:13:33 -0000       1.21
+++ erc.el      13 Dec 2006 02:36:31 -0000      1.22
@@ -1668,8 +1668,10 @@
 Due to some yet unresolved reason, global function `iswitchb-mode'
 needs to be active for this function to work."
   (interactive "P")
-  (eval-and-compile
+  (eval-when-compile
     (require 'iswitchb))
+  (let ((enabled iswitchb-mode))
+    (or enabled (iswitchb-mode 1))
   (let ((iswitchb-make-buflist-hook
         (lambda ()
           (setq iswitchb-temp-buflist
@@ -1683,7 +1685,8 @@
       (if (boundp 'erc-modified-channels-alist)
          (buffer-name (caar (last erc-modified-channels-alist)))
        nil)
-      t))))
+       t)))
+    (or enabled (iswitchb-mode -1))))
 
 (defun erc-channel-list (proc)
   "Return a list of channel buffers.