mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-08 20:58:58 +00:00
Code Issues Releases Activity

Merge from emacs-24; up to 117702

Browse Source
This commit is contained in:
Glenn Morris 2014-11-10 08:49:41 -08:00
commit 0121d32af5
6 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/erc/ChangeLog
View File

@ -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>

4
lisp/erc/erc-backend.el
View File

@ -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)

2
lisp/erc/erc-button.el
View File

@ -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"

4
lisp/erc/erc-join.el
View File

@ -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

2
lisp/erc/erc-match.el
View File

@ -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:

4
lisp/erc/erc.el
View File

@ -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 ()