From 87a95afe81dc7775ef134a94548dea68ed0cc3c3 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 6 Oct 2012 18:28:04 -0700 Subject: [PATCH] * lisp/erc/erc-backend.el (NICK): Handle pre-existing buffers. Fixes: debbugs:12002 --- lisp/erc/ChangeLog | 4 ++++ lisp/erc/erc-backend.el | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) 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 + + * erc-backend.el (NICK): Handle pre-existing buffers. (Bug#12002) + 2012-10-06 Glenn Morris * 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) -- 2.39.2