aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorGlenn Morris2012-09-26 23:45:38 -0700
committerGlenn Morris2012-09-26 23:45:38 -0700
commiteec5fae252a7553f1252af91726ed72f2f8d59f9 (patch)
treec2a82525f7cb3fa931bc2c49c6a9dbdaf2d81045 /admin
parent059f19ad6a46e718debd7aa0265e6bfc962d7129 (diff)
downloademacs-eec5fae252a7553f1252af91726ed72f2f8d59f9.tar.gz
emacs-eec5fae252a7553f1252af91726ed72f2f8d59f9.zip
* admin/admin.el (set-version): Set msdos.c's Vwindow_system_version.
Diffstat (limited to 'admin')
-rw-r--r--admin/ChangeLog4
-rw-r--r--admin/admin.el4
2 files changed, 8 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index b8394036afb..b5b1b75c55c 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
12012-09-27 Glenn Morris <rgm@gnu.org>
2
3 * admin.el (set-version): Set msdos.c's Vwindow_system_version.
4
12012-09-27 Paul Eggert <eggert@cs.ucla.edu> 52012-09-27 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 Check more robustly for timer_settime. 7 Check more robustly for timer_settime.
diff --git a/admin/admin.el b/admin/admin.el
index 862e5aed6c1..c71e6539413 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -129,8 +129,12 @@ Root must be the root of an Emacs source tree."
129 (rx (and "\"ProductVersion\"" (0+ space) ?, 129 (rx (and "\"ProductVersion\"" (0+ space) ?,
130 (0+ space) ?\" (submatch (1+ (in "0-9, "))) 130 (0+ space) ?\" (submatch (1+ (in "0-9, ")))
131 "\\0\""))) 131 "\\0\"")))
132 ;; Major version only.
132 (when (string-match "\\([0-9]\\{2,\\}\\)" version) 133 (when (string-match "\\([0-9]\\{2,\\}\\)" version)
133 (setq version (match-string 1 version)) 134 (setq version (match-string 1 version))
135 (set-version-in-file root "src/msdos.c" version
136 (rx (and "Vwindow_system_version" (1+ not-newline)
137 ?\( (submatch (1+ (in "0-9"))) ?\))))
134 (set-version-in-file root "etc/refcards/ru-refcard.tex" version 138 (set-version-in-file root "etc/refcards/ru-refcard.tex" version
135 "\\\\newcommand{\\\\versionemacs}\\[0\\]\ 139 "\\\\newcommand{\\\\versionemacs}\\[0\\]\
136{\\([0-9]\\{2,\\}\\)}.+%.+version of Emacs") 140{\\([0-9]\\{2,\\}\\)}.+%.+version of Emacs")