Commit 64a67db3 authored by Kelvin White's avatar Kelvin White
Browse files

Use local variable to determine if buffers should be renamed

Fixes: debbugs:18300
parent 3af2917c
2014-10-02 Kelvin White <kwhite@gnu.org>
* 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 <monnier@iro.umontreal.ca>
......
......@@ -1792,6 +1792,10 @@ 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
......@@ -6227,7 +6231,8 @@ shortened server name instead."
"@" 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))))))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment