diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/erc/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/erc/erc.el | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index e75b8cc0078..a4a7d47a0a9 100644 --- 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 7e76a6def42..cf422f1cfc5 100644 --- 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 |