[Emacs-diffs] emacs-24 3ca2ff3: * lisp/erc/erc.el (erc-rename-buffers): Doc fix. Add :version.

[Glenn Morris]

branch: emacs-24
commit 3ca2ff367aa09db7b122ee73d168f47fb8a8f819
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    * lisp/erc/erc.el (erc-rename-buffers): Doc fix.  Add :version.
---
 lisp/erc/ChangeLog |    6 +++++-
 lisp/erc/erc.el    |    4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 8e0c31a..b8357d1 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,7 +1,11 @@
+2015-02-13  Glenn Morris  <address@hidden>
+
+       * erc.el (erc-rename-buffers): Doc fix.  Add :version.
+
 2015-01-14  Dima Kogan  <address@hidden>
 
        * 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  <address@hidden>
 
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 7b9a3eb..e2366a1 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)