diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2011-09-25 23:02:21 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2011-09-25 23:02:21 -0400 |
| commit | a0c6445257576d75a85810dd93e020105d7ac17c (patch) | |
| tree | f9c3d17d409c46e87babb762e7d2b63cb83ab61c | |
| parent | b2bf61aa89138859313b14cde43face3e5dfc44a (diff) | |
| download | emacs-a0c6445257576d75a85810dd93e020105d7ac17c.tar.gz | |
* admin.el (set-version): Fix regexps for config.nt and sed2v2.inp.
| -rw-r--r-- | admin/ChangeLog | 5 | ||||
| -rw-r--r-- | admin/admin.el | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 9856f38fabb..7648b2a8455 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,8 @@ +2011-09-26 Chong Yidong <cyd@stupidchicken.com> + + * admin.el (set-version): Fix regexps for config.nt and + sed2v2.inp. + 2011-09-06 Paul Eggert <eggert@cs.ucla.edu> Merge from gnulib (Bug#9169). 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." (submatch (1+ (in "0-9.")))))) (set-version-in-file root "nt/config.nt" version (rx (and bol "#" (0+ blank) "define" (1+ blank) - "VERSION" (1+ blank) + "VERSION" (1+ blank) "\"" (submatch (1+ (in "0-9.")))))) (set-version-in-file root "msdos/sed2v2.inp" version (rx (and bol "/^#undef " (1+ not-newline) - "define VERSION" (1+ space) + "define VERSION" (1+ space) "\"" (submatch (1+ (in "0-9.")))))) (set-version-in-file root "nt/makefile.w32-in" version (rx (and "VERSION" (0+ space) "=" (0+ space) |