aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Merten2012-06-16 11:48:23 +0200
committerStefan Merten2012-06-16 11:48:23 +0200
commit6665a6fd1968288bc83ff8857665168b29828a8b (patch)
tree119779b17f9f2576b6aca93c3434cd1fb2a7eaa0
parent7ae2ea10755f41f24d0fc849d2d4addc4b570511 (diff)
downloademacs-6665a6fd1968288bc83ff8857665168b29828a8b.tar.gz
emacs-6665a6fd1968288bc83ff8857665168b29828a8b.zip
(rst-cvs-header, rst-svn-rev, rst-svn-timestamp)
(rst-official-version, rst-official-cvs-rev): Update version information.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/textmodes/rst.el10
2 files changed, 8 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 19be4b9fe5e..6e78f41e6a7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,9 @@
3 * textmodes/rst.el: Added and corrected some comments. 3 * textmodes/rst.el: Added and corrected some comments.
4 (rst-re-alist-def): Improve symbol syntax. 4 (rst-re-alist-def): Improve symbol syntax.
5 (rst-mode-syntax-table): Correct syntax entries. 5 (rst-mode-syntax-table): Correct syntax entries.
6 (rst-cvs-header, rst-svn-rev, rst-svn-timestamp)
7 (rst-official-version, rst-official-cvs-rev): Update version
8 information.
6 9
72012-06-15 Juanma Barranquero <lekktu@gmail.com> 102012-06-15 Juanma Barranquero <lekktu@gmail.com>
8 11
diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el
index b6f02dfda80..ab73f9a28d6 100644
--- a/lisp/textmodes/rst.el
+++ b/lisp/textmodes/rst.el
@@ -171,7 +171,7 @@ and before TAIL-RE and DELIM-RE in VAR or DEFAULT for no match."
171;; Use CVSHeader to really get information from CVS and not other version 171;; Use CVSHeader to really get information from CVS and not other version
172;; control systems. 172;; control systems.
173(defconst rst-cvs-header 173(defconst rst-cvs-header
174 "$CVSHeader: sm/rst_el/rst.el,v 1.285 2012-06-11 20:38:23 stefan Exp $") 174 "$CVSHeader: sm/rst_el/rst.el,v 1.287 2012-06-16 09:41:47 stefan Exp $")
175(defconst rst-cvs-rev 175(defconst rst-cvs-rev
176 (rst-extract-version "\\$" "CVSHeader: \\S + " "[0-9]+\\(?:\\.[0-9]+\\)+" 176 (rst-extract-version "\\$" "CVSHeader: \\S + " "[0-9]+\\(?:\\.[0-9]+\\)+"
177 " .*" rst-cvs-header "0.0") 177 " .*" rst-cvs-header "0.0")
@@ -185,22 +185,22 @@ and before TAIL-RE and DELIM-RE in VAR or DEFAULT for no match."
185;; Use LastChanged... to really get information from SVN. 185;; Use LastChanged... to really get information from SVN.
186(defconst rst-svn-rev 186(defconst rst-svn-rev
187 (rst-extract-version "\\$" "LastChangedRevision: " "[0-9]+" " " 187 (rst-extract-version "\\$" "LastChangedRevision: " "[0-9]+" " "
188 "$LastChangedRevision: 7399 $") 188 "$LastChangedRevision: 7444 $")
189 "The SVN revision of this file. 189 "The SVN revision of this file.
190SVN revision is the upstream (docutils) revision.") 190SVN revision is the upstream (docutils) revision.")
191(defconst rst-svn-timestamp 191(defconst rst-svn-timestamp
192 (rst-extract-version "\\$" "LastChangedDate: " ".+?+" " " 192 (rst-extract-version "\\$" "LastChangedDate: " ".+?+" " "
193 "$LastChangedDate: 2012-04-29 17:01:05 +0200 (Sun, 29 Apr 2012) $") 193 "$LastChangedDate: 2012-06-16 11:41:40 +0200 (Sat, 16 Jun 2012) $")
194 "The SVN time stamp of this file.") 194 "The SVN time stamp of this file.")
195 195
196;; Maintained by the release process. 196;; Maintained by the release process.
197(defconst rst-official-version 197(defconst rst-official-version
198 (rst-extract-version "%" "OfficialVersion: " "[0-9]+\\(?:\\.[0-9]+\\)+" " " 198 (rst-extract-version "%" "OfficialVersion: " "[0-9]+\\(?:\\.[0-9]+\\)+" " "
199 "%OfficialVersion: 1.2.1 %") 199 "%OfficialVersion: 1.3.0 %")
200 "Official version of the package.") 200 "Official version of the package.")
201(defconst rst-official-cvs-rev 201(defconst rst-official-cvs-rev
202 (rst-extract-version "[%$]" "Revision: " "[0-9]+\\(?:\\.[0-9]+\\)+" " " 202 (rst-extract-version "[%$]" "Revision: " "[0-9]+\\(?:\\.[0-9]+\\)+" " "
203 "%Revision: 1.256 %") 203 "%Revision: 1.287 %")
204 "CVS revision of this file in the official version.") 204 "CVS revision of this file in the official version.")
205 205
206(defconst rst-version 206(defconst rst-version