diff options
| author | Kelvin White <kwhite@gnu.org> | 2014-10-02 07:55:22 -0400 |
|---|---|---|
| committer | Kelvin White <kwhite@gnu.org> | 2014-10-02 07:55:22 -0400 |
| commit | 64a67db3cd6e8c81a747b03e35714ee5b411a976 (patch) | |
| tree | be45ad173b6d5cdb5d36cdc908ceb37bbb0933ab /lisp/erc | |
| parent | 3af2917c91e4eb863e1cec92a68ccb3acf940dae (diff) | |
| download | emacs-64a67db3cd6e8c81a747b03e35714ee5b411a976.tar.gz | |
Use local variable to determine if buffers should be renamed
Fixes: debbugs:18300
Diffstat (limited to 'lisp/erc')
| -rw-r--r-- | lisp/erc/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/erc/erc.el | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index e4f65895de9..b21b0cf827e 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,5 +1,10 @@ 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> diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 51096bc2c15..cf82bafe6d0 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -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)))))) |