[Emacs-diffs] /srv/bzr/emacs/trunk r110405: * lisp/erc/erc-backend.el (NICK): Handle pre-existing buffers.

[Glenn Morris]

------------------------------------------------------------
revno: 110405
fixes bug: http://debbugs.gnu.org/12002
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2012-10-06 18:28:04 -0700
message:
  * lisp/erc/erc-backend.el (NICK): Handle pre-existing buffers.
modified:
  lisp/erc/ChangeLog
  lisp/erc/erc-backend.el

=== modified file 'lisp/erc/ChangeLog'
--- a/lisp/erc/ChangeLog        2012-10-06 20:30:26 +0000
+++ b/lisp/erc/ChangeLog        2012-10-07 01:28:04 +0000
@@ -1,3 +1,7 @@
+2012-10-07  Glenn Morris  <address@hidden>
+
+       * erc-backend.el (NICK): Handle pre-existing buffers.  (Bug#12002)
+
 2012-10-06  Glenn Morris  <address@hidden>
 
        * erc.el (erc-lurker):

=== modified file 'lisp/erc/erc-backend.el'
--- a/lisp/erc/erc-backend.el   2012-10-06 01:04:53 +0000
+++ b/lisp/erc/erc-backend.el   2012-10-07 01:28:04 +0000
@@ -1316,7 +1316,7 @@
          (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)