* lisp/erc/erc-backend.el (NICK): Handle pre-existing buffers.

Fixes: debbugs:12002

2 files changed, 5 insertions, 1 deletions

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 9be0d3241ad..8b1cd18545c 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-07  Glenn Morris  <rgm@gnu.org>
+
+        * erc-backend.el (NICK): Handle pre-existing buffers.  (Bug#12002)
+
 2012-10-06  Glenn Morris  <rgm@gnu.org>
 
         * erc.el (erc-lurker):
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index 75f0047bf06..20ccd071b95 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -1316,7 +1316,7 @@ add things to `%s' instead."
          (when (equal (erc-default-target) nick)
            (setq erc-default-recipients
                  (cons nn (cdr erc-default-recipients)))
-           (rename-buffer nn)
+           (rename-buffer nn t)         ; bug#12002
            (erc-update-mode-line)
            (add-to-list 'bufs (current-buffer)))))
       (erc-update-user-nick nick nn host nil nil login)