[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r118349: Merge from emacs-24; up to 117702
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r118349: Merge from emacs-24; up to 117702 |
Date: |
Mon, 10 Nov 2014 16:50:14 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 118349 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2014-11-10 08:49:41 -0800
message:
Merge from emacs-24; up to 117702
modified:
lisp/erc/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-4305
lisp/erc/erc-backend.el
ercbackend.el-20091113204419-o5vbwnq5f7feedwu-4313
lisp/erc/erc-button.el
ercbutton.el-20091113204419-o5vbwnq5f7feedwu-4314
lisp/erc/erc-join.el ercjoin.el-20091113204419-o5vbwnq5f7feedwu-4364
lisp/erc/erc-match.el
ercmatch.el-20091113204419-o5vbwnq5f7feedwu-4327
lisp/erc/erc.el erc.el-20091113204419-o5vbwnq5f7feedwu-4346
=== modified file 'lisp/erc/ChangeLog'
--- a/lisp/erc/ChangeLog 2014-11-10 07:39:35 +0000
+++ b/lisp/erc/ChangeLog 2014-11-10 16:49:41 +0000
@@ -1,7 +1,6 @@
2014-11-10 Kelvin White <address@hidden>
- * 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 <address@hidden>
=== modified file 'lisp/erc/erc-backend.el'
--- a/lisp/erc/erc-backend.el 2014-11-10 07:39:35 +0000
+++ b/lisp/erc/erc-backend.el 2014-11-10 16:49:41 +0000
@@ -333,7 +333,7 @@
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 @@
(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)
=== modified file 'lisp/erc/erc-button.el'
--- a/lisp/erc/erc-button.el 2014-11-09 13:46:24 +0000
+++ b/lisp/erc/erc-button.el 2014-11-10 10:38:11 +0000
@@ -183,7 +183,7 @@
'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"
=== modified file 'lisp/erc/erc-join.el'
--- a/lisp/erc/erc-join.el 2014-11-09 13:46:24 +0000
+++ b/lisp/erc/erc-join.el 2014-11-10 10:38:11 +0000
@@ -83,7 +83,7 @@
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 @@
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
=== modified file 'lisp/erc/erc-match.el'
--- a/lisp/erc/erc-match.el 2014-11-09 13:46:24 +0000
+++ b/lisp/erc/erc-match.el 2014-11-10 10:38:11 +0000
@@ -237,7 +237,7 @@
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:
=== modified file 'lisp/erc/erc.el'
--- a/lisp/erc/erc.el 2014-11-10 07:39:35 +0000
+++ b/lisp/erc/erc.el 2014-11-10 16:49:41 +0000
@@ -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 @@
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 ()
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r118349: Merge from emacs-24; up to 117702,
Glenn Morris <=