diff options
| author | Glenn Morris <rgm@gnu.org> | 2015-02-13 13:19:20 -0500 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2015-02-13 13:19:20 -0500 |
| commit | 3ca2ff367aa09db7b122ee73d168f47fb8a8f819 (patch) | |
| tree | 8d2be7bfb1bd5f2c024433899060c0cd3f49f87f /lisp | |
| parent | b85523fea0b77a25b6afae8bdd6215acaf4455a1 (diff) | |
| download | emacs-3ca2ff367aa09db7b122ee73d168f47fb8a8f819.tar.gz emacs-3ca2ff367aa09db7b122ee73d168f47fb8a8f819.tar.bz2 emacs-3ca2ff367aa09db7b122ee73d168f47fb8a8f819.zip | |
* lisp/erc/erc.el (erc-rename-buffers): Doc fix. Add :version.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/erc/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/erc/erc.el | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index 8e0c31a7dec..b8357d1de6b 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,7 +1,11 @@ +2015-02-13 Glenn Morris <rgm@gnu.org> + + * erc.el (erc-rename-buffers): Doc fix. Add :version. + 2015-01-14 Dima Kogan <dima@secretsauce.net> * erc-backend.el (define-erc-response-handler): Give hook-name - default value of nil and add-to-list (bug#19363) + default value of nil and add-to-list (bug#19363). 2014-11-10 Kelvin White <kwhite@gnu.org> diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 7b9a3eb8620..e2366a1b58f 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -197,7 +197,8 @@ parameters and authentication." (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" + "Non-nil means rename buffers with network name, if available." + :version "24.5" :group 'erc :type 'boolean) @@ -1148,6 +1149,7 @@ which the local user typed." "Faces for ERC." :group 'erc) +;; FIXME faces should not end in "-face". (defface erc-default-face '((t)) "ERC default face." :group 'erc-faces) |