Merge from emacs-24; up to 117702

6 files changed, 9 insertions, 10 deletions

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 475b99edb93..9b8ec66ff55 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,7 +1,6 @@
 2014-11-10  Kelvin White  <kwhite@gnu.org>
 
-	* erc-match.el, erc-join.el, erc-stamp.el, erc-backend.el, erc.el:
-	* erc-button.el: Update version to 24.5.
+	* erc-stamp.el (erc-timestamp-intangible): Change version tag to 24.5.
 
 2014-11-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index 2c6b03720f0..fb22f58822d 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -333,7 +333,7 @@ Good luck."
 This will only be consulted if the coding system in
 `erc-server-coding-system' is `undecided'."
   :group 'erc-server
-  :version "24.5"
+  :version "24.1"
   :type '(repeat coding-system))
 
 (defcustom erc-server-coding-system (if (and (fboundp 'coding-system-p)
@@ -400,7 +400,7 @@ isn't displayed."
 (defcustom erc-server-timestamp-format "%Y-%m-%d %T"
   "Timestamp format used with server response messages.
 This string is processed using `format-time-string'."
-  :version "24.5"
+  :version "24.3"
   :type 'string
   :group 'erc-server)
 
diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el
index b83fd9eeeb9..10e73182fbd 100644
--- a/lisp/erc/erc-button.el
+++ b/lisp/erc/erc-button.el
@@ -183,7 +183,7 @@ PAR is a number of a regexp grouping whose text will be passed to
   'nicknames, these are ignored, and CALLBACK will be called with
   the nickname matched as the argument."
   :group 'erc-button
-  :version "24.5"                       ; remove finger (bug#4443)
+  :version "24.1"                       ; remove finger (bug#4443)
   :type '(repeat
           (list :tag "Button"
                 (choice :tag "Matches"
diff --git a/lisp/erc/erc-join.el b/lisp/erc/erc-join.el
index 0a24cb864da..e47e6e0c89e 100644
--- a/lisp/erc/erc-join.el
+++ b/lisp/erc/erc-join.el
@@ -83,7 +83,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.5"
+  :version "24.1"
   :type  '(choice (const :tag "On Connection" connect)
 		  (const :tag "When Identified" ident)))
 
@@ -93,7 +93,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.5"
+  :version "24.1"
   :type  'integer)
 
 (defcustom erc-autojoin-domain-only t
diff --git a/lisp/erc/erc-match.el b/lisp/erc/erc-match.el
index a8a4e58362c..b10da96f6f4 100644
--- a/lisp/erc/erc-match.el
+++ b/lisp/erc/erc-match.el
@@ -237,7 +237,7 @@ current-nick, keyword, pal, dangerous-host, fool"
 useful for excluding all the things like MOTDs from the server
 and other miscellaneous functions."
   :group 'erc-match
-  :version "24.5"
+  :version "24.3"
   :type 'boolean)
 
 ;; Internal variables:
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 4acb7340fb2..37b24eaaa60 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -104,7 +104,7 @@
 
 (defgroup erc-lurker nil
   "Hide specified message types sent by lurkers"
-  :version "24.5"
+  :version "24.3"
   :group 'erc-ignore)
 
 (defgroup erc-query nil
@@ -5291,7 +5291,7 @@ into the ERC buffer, that text is not sent to the IRC server.
 If the value is nil, `erc-send-current-line' always considers any
 submitted line to be intentional."
   :group 'erc
-  :version "24.5"
+  :version "24.4"
   :type '(choice number (other :tag "disabled" nil)))
 
 (defun erc-send-current-line ()