[Emacs-diffs] /srv/bzr/emacs/trunk r107182: Add missing :version tags for new erc defcustoms.

[Glenn Morris]

------------------------------------------------------------
revno: 107182
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2012-02-08 00:07:24 -0800
message:
  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.
modified:
  etc/NEWS
  lisp/erc/ChangeLog
  lisp/erc/erc-backend.el
  lisp/erc/erc-join.el

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2012-02-08 08:00:03 +0000
+++ b/etc/NEWS  2012-02-08 08:07:24 +0000
@@ -701,11 +701,9 @@
 
 ** 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.

=== modified file 'lisp/erc/ChangeLog'
--- a/lisp/erc/ChangeLog        2012-02-08 04:32:46 +0000
+++ b/lisp/erc/ChangeLog        2012-02-08 08:07:24 +0000
@@ -1,3 +1,9 @@
+2012-02-08  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * erc.el (erc-tls): Add autoload cookie.  (Bug#10333)

=== modified file 'lisp/erc/erc-backend.el'
--- a/lisp/erc/erc-backend.el   2012-01-19 07:21:25 +0000
+++ b/lisp/erc/erc-backend.el   2012-02-08 08:07:24 +0000
@@ -329,6 +329,7 @@
 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)

=== modified file 'lisp/erc/erc-join.el'
--- a/lisp/erc/erc-join.el      2012-01-19 07:21:25 +0000
+++ b/lisp/erc/erc-join.el      2012-02-08 08:07:24 +0000
@@ -75,6 +75,7 @@
 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 @@
 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