From: Kevin Brubeck Unhammer <unhammer@fsfe.org>
Date: Wed, 5 Aug 2020 09:13:51 +0000 (+0200)
Subject: Further fix for erc-generate-new-buffer-name
X-Git-Tag: emacs-28.0.90~6813
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c72b734c917f635fac09f691e91d3391b00b96f2;p=emacs.git

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).
---

diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 927546abc30..62aa76d25c8 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: