aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Merten2015-10-04 22:23:46 +0200
committerStefan Merten2015-10-04 22:30:30 +0200
commit94e5235007d094cfd1235b11f1855033cc4359a3 (patch)
tree291bb959e8a5d6798049c5a3fd7a8b13be90a0d5
parentcacebbdaec5b38f02f5c1c4e9c7766a99835197f (diff)
downloademacs-94e5235007d094cfd1235b11f1855033cc4359a3.tar.gz
emacs-94e5235007d094cfd1235b11f1855033cc4359a3.zip
Pull in version numbers from rst.el upstream release.
* lisp/textmodes/rst.el (rst-cvs-header, rst-svn-rev) (rst-svn-timestamp, rst-official-version) (rst-official-cvs-rev, rst-package-emacs-version-alist): Update version numbers.
-rw-r--r--lisp/textmodes/rst.el11
1 files changed, 6 insertions, 5 deletions
diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el
index 581e16e7cd8..7b2aabd7ea5 100644
--- a/lisp/textmodes/rst.el
+++ b/lisp/textmodes/rst.el
@@ -218,7 +218,7 @@ and before TAIL-RE and DELIM-RE in VAR or DEFAULT for no match."
218;; Use CVSHeader to really get information from CVS and not other version 218;; Use CVSHeader to really get information from CVS and not other version
219;; control systems. 219;; control systems.
220(defconst rst-cvs-header 220(defconst rst-cvs-header
221 "$CVSHeader: sm/rst_el/rst.el,v 1.327.2.6 2012-10-07 13:05:50 stefan Exp $") 221 "$CVSHeader: sm/rst_el/rst.el,v 1.327.2.26 2015/10/04 09:26:04 stefan Exp $")
222(defconst rst-cvs-rev 222(defconst rst-cvs-rev
223 (rst-extract-version "\\$" "CVSHeader: \\S + " "[0-9]+\\(?:\\.[0-9]+\\)+" 223 (rst-extract-version "\\$" "CVSHeader: \\S + " "[0-9]+\\(?:\\.[0-9]+\\)+"
224 " .*" rst-cvs-header "0.0") 224 " .*" rst-cvs-header "0.0")
@@ -232,22 +232,22 @@ and before TAIL-RE and DELIM-RE in VAR or DEFAULT for no match."
232;; Use LastChanged... to really get information from SVN. 232;; Use LastChanged... to really get information from SVN.
233(defconst rst-svn-rev 233(defconst rst-svn-rev
234 (rst-extract-version "\\$" "LastChangedRevision: " "[0-9]+" " " 234 (rst-extract-version "\\$" "LastChangedRevision: " "[0-9]+" " "
235 "$LastChangedRevision: 7515 $") 235 "$LastChangedRevision: 7925 $")
236 "The SVN revision of this file. 236 "The SVN revision of this file.
237SVN revision is the upstream (docutils) revision.") 237SVN revision is the upstream (docutils) revision.")
238(defconst rst-svn-timestamp 238(defconst rst-svn-timestamp
239 (rst-extract-version "\\$" "LastChangedDate: " ".+?+" " " 239 (rst-extract-version "\\$" "LastChangedDate: " ".+?+" " "
240 "$LastChangedDate: 2012-09-20 23:28:53 +0200 (Thu, 20 Sep 2012) $") 240 "$LastChangedDate: 2015-10-04 11:21:35 +0200 (Sun, 04 Oct 2015) $")
241 "The SVN time stamp of this file.") 241 "The SVN time stamp of this file.")
242 242
243;; Maintained by the release process. 243;; Maintained by the release process.
244(defconst rst-official-version 244(defconst rst-official-version
245 (rst-extract-version "%" "OfficialVersion: " "[0-9]+\\(?:\\.[0-9]+\\)+" " " 245 (rst-extract-version "%" "OfficialVersion: " "[0-9]+\\(?:\\.[0-9]+\\)+" " "
246 "%OfficialVersion: 1.4.0 %") 246 "%OfficialVersion: 1.4.1 %")
247 "Official version of the package.") 247 "Official version of the package.")
248(defconst rst-official-cvs-rev 248(defconst rst-official-cvs-rev
249 (rst-extract-version "[%$]" "Revision: " "[0-9]+\\(?:\\.[0-9]+\\)+" " " 249 (rst-extract-version "[%$]" "Revision: " "[0-9]+\\(?:\\.[0-9]+\\)+" " "
250 "%Revision: 1.327 %") 250 "%Revision: 1.327.2.25 %")
251 "CVS revision of this file in the official version.") 251 "CVS revision of this file in the official version.")
252 252
253(defconst rst-version 253(defconst rst-version
@@ -267,6 +267,7 @@ in parentheses follows the development revision and the time stamp.")
267 ("1.3.0" . "24.3") 267 ("1.3.0" . "24.3")
268 ("1.3.1" . "24.3") 268 ("1.3.1" . "24.3")
269 ("1.4.0" . "24.3") 269 ("1.4.0" . "24.3")
270 ("1.4.1" . "24.5")
270 )) 271 ))
271 272
272(unless (assoc rst-official-version rst-package-emacs-version-alist) 273(unless (assoc rst-official-version rst-package-emacs-version-alist)