aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKelvin White2014-11-10 05:38:11 -0500
committerKelvin White2014-11-10 05:38:11 -0500
commitfbc782bd18464a1a1f70b73c385635f8d5f93409 (patch)
tree7fc1bb1b1e3604abbc44eaeee91881efc4f99996
parent02ded86f0731de1c84cda5d56913e932f1bbcfc0 (diff)
downloademacs-fbc782bd18464a1a1f70b73c385635f8d5f93409.tar.gz
emacs-fbc782bd18464a1a1f70b73c385635f8d5f93409.zip
fix version tags
-rw-r--r--lisp/erc/ChangeLog5
-rw-r--r--lisp/erc/erc-backend.el4
-rw-r--r--lisp/erc/erc-button.el2
-rw-r--r--lisp/erc/erc-join.el4
-rw-r--r--lisp/erc/erc-match.el2
-rw-r--r--lisp/erc/erc.el4
6 files changed, 10 insertions, 11 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 3b056da2e5e..d80c6a55b17 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,7 +1,6 @@
12014-11-09 Kelvin White <kwhite@gnu.org> 12014-11-10 Kelvin White <kwhite@gnu.org>
2 2
3 * erc-match.el, erc-join.el, erc-stamp.el, erc-backend.el, erc.el, 3 * erc-stamp.el: change version tag to 24.5
4 erc-button.el: Update version to 24.5.
5 4
62014-11-09 Ivan Shmakov <ivan@siamics.net> 52014-11-09 Ivan Shmakov <ivan@siamics.net>
7 6
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."
333This will only be consulted if the coding system in 333This will only be consulted if the coding system in
334`erc-server-coding-system' is `undecided'." 334`erc-server-coding-system' is `undecided'."
335 :group 'erc-server 335 :group 'erc-server
336 :version "24.5" 336 :version "24.1"
337 :type '(repeat coding-system)) 337 :type '(repeat coding-system))
338 338
339(defcustom erc-server-coding-system (if (and (fboundp 'coding-system-p) 339(defcustom erc-server-coding-system (if (and (fboundp 'coding-system-p)
@@ -400,7 +400,7 @@ isn't displayed."
400(defcustom erc-server-timestamp-format "%Y-%m-%d %T" 400(defcustom erc-server-timestamp-format "%Y-%m-%d %T"
401 "Timestamp format used with server response messages. 401 "Timestamp format used with server response messages.
402This string is processed using `format-time-string'." 402This string is processed using `format-time-string'."
403 :version "24.5" 403 :version "24.3"
404 :type 'string 404 :type 'string
405 :group 'erc-server) 405 :group 'erc-server)
406 406
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
183 'nicknames, these are ignored, and CALLBACK will be called with 183 'nicknames, these are ignored, and CALLBACK will be called with
184 the nickname matched as the argument." 184 the nickname matched as the argument."
185 :group 'erc-button 185 :group 'erc-button
186 :version "24.5" ; remove finger (bug#4443) 186 :version "24.1" ; remove finger (bug#4443)
187 :type '(repeat 187 :type '(repeat
188 (list :tag "Button" 188 (list :tag "Button"
189 (choice :tag "Matches" 189 (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
83identification, or after `erc-autojoin-delay' seconds. 83identification, or after `erc-autojoin-delay' seconds.
84Any other value means the same as `connect'." 84Any other value means the same as `connect'."
85 :group 'erc-autojoin 85 :group 'erc-autojoin
86 :version "24.5" 86 :version "24.1"
87 :type '(choice (const :tag "On Connection" connect) 87 :type '(choice (const :tag "On Connection" connect)
88 (const :tag "When Identified" ident))) 88 (const :tag "When Identified" ident)))
89 89
@@ -93,7 +93,7 @@ This only takes effect if `erc-autojoin-timing' is `ident'.
93If NickServ identification occurs before this delay expires, ERC 93If NickServ identification occurs before this delay expires, ERC
94autojoins immediately at that time." 94autojoins immediately at that time."
95 :group 'erc-autojoin 95 :group 'erc-autojoin
96 :version "24.5" 96 :version "24.1"
97 :type 'integer) 97 :type 'integer)
98 98
99(defcustom erc-autojoin-domain-only t 99(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"
237useful for excluding all the things like MOTDs from the server 237useful for excluding all the things like MOTDs from the server
238and other miscellaneous functions." 238and other miscellaneous functions."
239 :group 'erc-match 239 :group 'erc-match
240 :version "24.5" 240 :version "24.3"
241 :type 'boolean) 241 :type 'boolean)
242 242
243;; Internal variables: 243;; 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 @@
104 104
105(defgroup erc-lurker nil 105(defgroup erc-lurker nil
106 "Hide specified message types sent by lurkers" 106 "Hide specified message types sent by lurkers"
107 :version "24.5" 107 :version "24.3"
108 :group 'erc-ignore) 108 :group 'erc-ignore)
109 109
110(defgroup erc-query nil 110(defgroup erc-query nil
@@ -5291,7 +5291,7 @@ into the ERC buffer, that text is not sent to the IRC server.
5291If the value is nil, `erc-send-current-line' always considers any 5291If the value is nil, `erc-send-current-line' always considers any
5292submitted line to be intentional." 5292submitted line to be intentional."
5293 :group 'erc 5293 :group 'erc
5294 :version "24.5" 5294 :version "24.4"
5295 :type '(choice number (other :tag "disabled" nil))) 5295 :type '(choice number (other :tag "disabled" nil)))
5296 5296
5297(defun erc-send-current-line () 5297(defun erc-send-current-line ()