[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 176d864: * lisp/erc/erc.el (erc-switch-to-buffer):
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] master 176d864: * lisp/erc/erc.el (erc-switch-to-buffer): Fix last change. |
Date: |
Wed, 25 Mar 2015 12:53:52 +0000 |
branch: master
commit 176d864cbfb4110eff983dd0053b8401fb76e82c
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>
* lisp/erc/erc.el (erc-switch-to-buffer): Fix last change.
Fixes: debbugs:20187
---
lisp/erc/ChangeLog | 4 ++++
lisp/erc/erc.el | 3 ++-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index e75b8cc..a4a7d47 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-25 Stefan Monnier <address@hidden>
+
+ * erc.el (erc-switch-to-buffer): Fix last change (bug#20187).
+
2015-03-16 Stefan Monnier <address@hidden>
* 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 7e76a6d..cf422f1 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 176d864: * lisp/erc/erc.el (erc-switch-to-buffer): Fix last change.,
Stefan Monnier <=