aboutsummaryrefslogtreecommitdiffstats
path: root/admin/admin.el
diff options
context:
space:
mode:
authorKenichi Handa2011-09-27 11:18:32 +0900
committerKenichi Handa2011-09-27 11:18:32 +0900
commit9aa99d0176c2021194f38eb27668395cd242395f (patch)
tree7a297fd59f2f77833e94d3b0f8ce84d89d3f413c /admin/admin.el
parentdd7aa8dd07c456d5519194c279a808213b63cb3d (diff)
parentd594cb6163558c29797f8fc6939666574ea4a617 (diff)
downloademacs-9aa99d0176c2021194f38eb27668395cd242395f.tar.gz
emacs-9aa99d0176c2021194f38eb27668395cd242395f.zip
merge trunk
Diffstat (limited to 'admin/admin.el')
-rw-r--r--admin/admin.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/admin/admin.el b/admin/admin.el
index 70958ce1a76..673d86c8825 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -75,11 +75,11 @@ Root must be the root of an Emacs source tree."
75 (submatch (1+ (in "0-9.")))))) 75 (submatch (1+ (in "0-9."))))))
76 (set-version-in-file root "nt/config.nt" version 76 (set-version-in-file root "nt/config.nt" version
77 (rx (and bol "#" (0+ blank) "define" (1+ blank) 77 (rx (and bol "#" (0+ blank) "define" (1+ blank)
78 "VERSION" (1+ blank) 78 "VERSION" (1+ blank) "\""
79 (submatch (1+ (in "0-9.")))))) 79 (submatch (1+ (in "0-9."))))))
80 (set-version-in-file root "msdos/sed2v2.inp" version 80 (set-version-in-file root "msdos/sed2v2.inp" version
81 (rx (and bol "/^#undef " (1+ not-newline) 81 (rx (and bol "/^#undef " (1+ not-newline)
82 "define VERSION" (1+ space) 82 "define VERSION" (1+ space) "\""
83 (submatch (1+ (in "0-9.")))))) 83 (submatch (1+ (in "0-9."))))))
84 (set-version-in-file root "nt/makefile.w32-in" version 84 (set-version-in-file root "nt/makefile.w32-in" version
85 (rx (and "VERSION" (0+ space) "=" (0+ space) 85 (rx (and "VERSION" (0+ space) "=" (0+ space)