From efb615a7115d8cb1980e149da8d00ab627e639a1 Mon Sep 17 00:00:00 2001 From: Kelvin White Date: Fri, 3 Oct 2014 07:08:37 -0400 Subject: [PATCH] erc.el (erc-rename-buffers): Use defcustom instead of defvar. --- lisp/erc/ChangeLog | 5 +++++ lisp/erc/erc.el | 11 ++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index 1ebef32f324..300bcfc74da 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,8 @@ +2014-10-03 Kelvin White + + * erc.el (erc-rename-buffers): Use defcustom instead of defvar for + buffer renaming configuration option. + 2014-10-02 Paul Eggert * erc.el (erc-nick-at-point): Fix format-string typo (Bug#17755). diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index c916aea6954..2825481c2a1 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -196,6 +196,11 @@ parameters and authentication." :set (lambda (sym val) (set sym (if (functionp val) (funcall val) val)))) +(defcustom erc-rename-buffers nil + "When this is set to t, buffers will be renamed to network name if available" + :group 'erc + :type 'boolean) + (defvar erc-password nil "Password to use when authenticating to an IRC server. It is not strictly necessary to provide this, since ERC will @@ -1792,10 +1797,6 @@ buffer rather than a server buffer.") "Used to keep track of how many times an attempt at changing nick is made.") (make-variable-buffer-local 'erc-nick-change-attempt-count) -(defvar erc-rename-buffer-p nil - "When this is set to t, buffers will be renamed to network name if available") -(make-variable-buffer-local 'erc-rename-buffer-p) - (defun erc-migrate-modules (mods) "Migrate old names of ERC modules to new ones." ;; modify `transforms' to specify what needs to be changed @@ -6231,7 +6232,7 @@ shortened server name instead." "@" network-name)) ((and network-name (not (get-buffer network-name))) - (when erc-rename-buffer-p + (when erc-rename-buffers (rename-buffer network-name)) network-name) (t (buffer-name (current-buffer))))))