Add missing :version tags for new erc defcustoms.

* lisp/erc/erc-backend.el (erc-coding-system-precedence):
* lisp/erc/erc-join.el (erc-autojoin-delay, erc-autojoin-timing):
Add missing :version settings.

* etc/NEWS: We don't need to duplicate the doc-strings of variables.

4 files changed, 12 insertions, 5 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 08214542d4c..d0993707cf1 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -701,11 +701,9 @@ The standard directory local variables feature replaces it.
 
 ** ERC changes
 
-*** New vars `erc-autojoin-timing' and `erc-autojoin-delay'.
-If the value of `erc-autojoin-timing' is 'ident, ERC autojoins after a
-successful NickServ identification, or after `erc-autojoin-delay'
-seconds.  The default value, 'ident, means to autojoin immediately
-after connecting.
+---
+*** New options `erc-autojoin-timing' and `erc-autojoin-delay',
+controlling attempts to autojoin a channel.
 
 *** New variable `erc-coding-system-precedence': If we use `undecided'
 as the server coding system, this variable will then be consulted.
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index dcc7b8c90cf..af853c4e230 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-08  Glenn Morris  <rgm@gnu.org>
+
+        * erc-backend.el (erc-coding-system-precedence):
+        * erc-join.el (erc-autojoin-delay, erc-autojoin-timing):
+        Add missing :version settings.
+
 2012-01-06  Glenn Morris  <rgm@gnu.org>
 
         * erc.el (erc-tls): Add autoload cookie.  (Bug#10333)
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index 2c76b04e3ef..7bc56584eaf 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -329,6 +329,7 @@ Good luck."
 This will only be consulted if the coding system in
 `erc-server-coding-system' is `undecided'."
   :group 'erc-server
+  :version "24.1"
   :type '(repeat coding-system))
 
 (defcustom erc-server-coding-system (if (and (fboundp 'coding-system-p)
diff --git a/lisp/erc/erc-join.el b/lisp/erc/erc-join.el
index 855dde75542..da894ba5977 100644
--- a/lisp/erc/erc-join.el
+++ b/lisp/erc/erc-join.el
@@ -75,6 +75,7 @@ If the value is `ident', autojoin after successful NickServ
 identification, or after `erc-autojoin-delay' seconds.
 Any other value means the same as `connect'."
   :group 'erc-autojoin
+  :version "24.1"
   :type  '(choice (const :tag "On Connection" 'connect)
                   (const :tag "When Identified" 'ident)))
 
@@ -84,6 +85,7 @@ This only takes effect if `erc-autojoin-timing' is `ident'.
 If NickServ identification occurs before this delay expires, ERC
 autojoins immediately at that time."
   :group 'erc-autojoin
+  :version "24.1"
   :type  'integer)
 
 (defcustom erc-autojoin-domain-only t