[Emacs-diffs] trunk r118024: erc.el (erc-rename-buffers): Use defcustom instead of defvar.

[Kelvin White]

------------------------------------------------------------
revno: 118024
revision-id: address@hidden
parent: address@hidden
committer: Kelvin White <address@hidden>
branch nick: trunk
timestamp: Fri 2014-10-03 07:08:37 -0400
message:
  erc.el (erc-rename-buffers): Use defcustom instead of defvar.
modified:
  lisp/erc/ChangeLog             changelog-20091113204419-o5vbwnq5f7feedwu-4305
  lisp/erc/erc.el                erc.el-20091113204419-o5vbwnq5f7feedwu-4346

=== modified file 'lisp/erc/ChangeLog'
--- a/lisp/erc/ChangeLog        2014-10-02 19:28:26 +0000
+++ b/lisp/erc/ChangeLog        2014-10-03 11:08:37 +0000
@@ -1,3 +1,8 @@
+2014-10-03  Kelvin White  <address@hidden>
+
+       * erc.el (erc-rename-buffers): Use defcustom instead of defvar for
+       buffer renaming configuration option.
+
 2014-10-02  Paul Eggert  <address@hidden>
 
        * erc.el (erc-nick-at-point): Fix format-string typo (Bug#17755).

=== modified file 'lisp/erc/erc.el'
--- a/lisp/erc/erc.el   2014-10-02 19:28:26 +0000
+++ b/lisp/erc/erc.el   2014-10-03 11:08:37 +0000
@@ -196,6 +196,11 @@
   :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 @@
   "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 @@
                    "@" 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))))))