[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master c72b734: Further fix for erc-generate-new-buffer-name
From: |
Lars Ingebrigtsen |
Subject: |
master c72b734: Further fix for erc-generate-new-buffer-name |
Date: |
Wed, 5 Aug 2020 05:14:00 -0400 (EDT) |
branch: master
commit c72b734c917f635fac09f691e91d3391b00b96f2
Author: Kevin Brubeck Unhammer <unhammer@fsfe.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>
Further fix for erc-generate-new-buffer-name
* lisp/erc/erc.el (erc-generate-new-buffer-name): Fix buffer name
generation when there's two networks on the same
server:port (bug#40121).
---
lisp/erc/erc.el | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 927546a..62aa76d 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -1630,9 +1630,10 @@ symbol, it may have these values:
(and (erc-server-buffer-p)
(not (erc-server-process-alive)))))
;; Channel buffer; check that it's from the right server.
- (with-current-buffer (get-buffer candidate)
- (and (string= erc-session-server server)
- (erc-port-equal erc-session-port port)))))
+ (and target
+ (with-current-buffer (get-buffer candidate)
+ (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:
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master c72b734: Further fix for erc-generate-new-buffer-name,
Lars Ingebrigtsen <=