From: Glenn Morris <rgm@gnu.org>
Date: Sun, 7 Oct 2012 01:28:04 +0000 (-0700)
Subject: * lisp/erc/erc-backend.el (NICK): Handle pre-existing buffers.
X-Git-Tag: emacs-24.2.90~239^2~14
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=87a95afe81dc7775ef134a94548dea68ed0cc3c3;p=emacs.git

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

Fixes: debbugs:12002
---

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)