[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master cdefc04: Subject: Fix problem with erc buffer renam
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] master cdefc04: Subject: Fix problem with erc buffer renames after reconnect |
Date: |
Sat, 14 Apr 2018 14:11:41 -0400 (EDT) |
branch: master
commit cdefc045893a7fed57856ac385ab41c71f61c09f
Author: John Goerzen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>
Subject: Fix problem with erc buffer renames after reconnect
* lisp/erc/erc.el (erc-generate-new-buffer-name): Solve problem
with renamed buffers on different servers after reconnect (bug#30639).
Copyright-paperwork-exempt: yes
---
lisp/erc/erc.el | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 550800c..6322851 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -1608,18 +1608,18 @@ symbol, it may have these values:
(dolist (candidate (list buf-name (concat buf-name "/" server)))
(if (and (not buffer-name)
erc-reuse-buffers
- (get-buffer candidate)
- (or target
+ (or (not (get-buffer candidate))
+ (or target
+ (with-current-buffer (get-buffer candidate)
+ (and (erc-server-buffer-p)
+ (not (erc-server-process-alive)))))
(with-current-buffer (get-buffer candidate)
- (and (erc-server-buffer-p)
- (not (erc-server-process-alive)))))
- (with-current-buffer (get-buffer candidate)
- (and (string= erc-session-server server)
- (erc-port-equal erc-session-port port))))
+ (and (string= erc-session-server server)
+ (erc-port-equal erc-session-port port)))))
(setq buffer-name candidate)))
;; if buffer-name is unset, neither candidate worked out for us,
;; fallback to the old <N> uniquification method:
- (or buffer-name (generate-new-buffer-name buf-name)) ))
+ (or buffer-name (generate-new-buffer-name (concat buf-name "/" server)))))
(defun erc-get-buffer-create (server port target)
"Create a new buffer based on the arguments."
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master cdefc04: Subject: Fix problem with erc buffer renames after reconnect,
Lars Ingebrigtsen <=