[Emacs-diffs] trunk r118009: Use local variable to determine if buffers should be renamed

[Kelvin White]

------------------------------------------------------------
revno: 118009
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18300
committer: Kelvin White <address@hidden>
branch nick: trunk
timestamp: Thu 2014-10-02 07:55:22 -0400
message:
  Use local variable to determine if buffers should be renamed
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 11:31:56 +0000
+++ b/lisp/erc/ChangeLog        2014-10-02 11:55:22 +0000
@@ -1,5 +1,10 @@
 2014-10-02  Kelvin White  <address@hidden>
 
+       * erc.el (erc-rename-buffer-p): When set to t buffers will be
+       renamed to the current irc network.
+       (erc-format-target-and/or-network): Use `erc-rename-buffer-p' when
+       renaming buffers.
+
        * erc-ring.el (erc-input-ring-setup): Fixes Bug #18599
 
 2014-09-30  Stefan Monnier  <address@hidden>

=== modified file 'lisp/erc/erc.el'
--- a/lisp/erc/erc.el   2014-09-26 13:22:47 +0000
+++ b/lisp/erc/erc.el   2014-10-02 11:55:22 +0000
@@ -1792,6 +1792,10 @@
   "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
@@ -6227,7 +6231,8 @@
                    "@" network-name))
           ((and network-name 
                 (not (get-buffer network-name)))
-           (rename-buffer network-name)
+           (when erc-rename-buffer-p
+            (rename-buffer network-name))
            network-name)
           (t (buffer-name (current-buffer))))))