mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-26 10:49:33 +00:00
Code Issues Releases Activity

erc.el (erc-rename-buffers): Use defcustom instead of defvar.

Browse Source
This commit is contained in:
Kelvin White 2014-10-03 07:08:37 -04:00
parent 955d5d047d
commit efb615a711
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/erc/ChangeLog
View File

@ -1,3 +1,8 @@
2014-10-03 Kelvin White <kwhite@gnu.org>
* erc.el (erc-rename-buffers): Use defcustom instead of defvar for
buffer renaming configuration option.
2014-10-02 Paul Eggert <eggert@cs.ucla.edu>
* erc.el (erc-nick-at-point): Fix format-string typo (Bug#17755).

11
lisp/erc/erc.el
View File

@ -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))))))