* lisp/erc/erc.el (erc-switch-to-buffer): Fix last change.

Fixes: debbugs:20187

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index e75b8cc00787c5a432969f40b9622c8ec65321f8..a4a7d47a0a91b35e4cb1853e81811c3b5cf252b3 100644 (file)
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * erc.el (erc-switch-to-buffer): Fix last change (bug#20187).
+
 2015-03-16  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * erc.el (erc-switch-to-buffer): Rename from erc-iswitchb and rewrite

diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 7e76a6def4230aaf86d34b308d255ccce6867364..cf422f1cfc551d7d1827265bc3c68eda12861eb9 100644 (file)
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -1717,7 +1717,8 @@ If `erc-track-mode' is in enabled, put the last element of
                ;; Only allow ERC buffers in the same session.
                (let ((proc (unless arg erc-server-process)))
                  (lambda (bufname)
-                   (let ((buf (get-buffer bufname)))
+                   (let ((buf (if (consp bufname)
+                                  (cdr bufname) (get-buffer bufname))))
                      (when buf
                        (erc--buffer-p buf (lambda () t) proc)
                        (with-current-buffer buf