aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
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 64d6de69d10..87ba151dc34 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
12011-02-19 Eli Zaretskii <eliz@gnu.org>
2
3 * admin.el (set-version): Add msdos/sed2v2.inp.
4
12011-02-16 Paul Eggert <eggert@cs.ucla.edu> 52011-02-16 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 Remove no-longer needed getloadavg symbols. 7 Remove no-longer needed getloadavg symbols.
diff --git a/admin/admin.el b/admin/admin.el
index 9f87e9b2590..717bfee702d 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -77,6 +77,10 @@ Root must be the root of an Emacs source tree."
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
81 (rx (and bol "/^#undef " (1+ not-newline)
82 "define VERSION" (1+ space)
83 (submatch (1+ (in "0-9."))))))
80 (set-version-in-file root "nt/makefile.w32-in" version 84 (set-version-in-file root "nt/makefile.w32-in" version
81 (rx (and "VERSION" (0+ space) "=" (0+ space) 85 (rx (and "VERSION" (0+ space) "=" (0+ space)
82 (submatch (1+ (in "0-9.")))))) 86 (submatch (1+ (in "0-9."))))))