diff options
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/ChangeLog | 5 | ||||
| -rw-r--r-- | admin/admin.el | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 6f2ac5d67d5..f7d60b08e4c 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-01-31 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * admin.el (set-version): Remove lib-src/makefile.w32-in. Add | ||
| 4 | nt/config.nt. | ||
| 5 | |||
| 1 | 2011-01-31 Paul Eggert <eggert@cs.ucla.edu> | 6 | 2011-01-31 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 7 | ||
| 3 | src/emacs.c now gets version number from configure.in | 8 | src/emacs.c now gets version number from configure.in |
diff --git a/admin/admin.el b/admin/admin.el index 739c769b352..9f87e9b2590 100644 --- a/admin/admin.el +++ b/admin/admin.el | |||
| @@ -73,8 +73,9 @@ Root must be the root of an Emacs source tree." | |||
| 73 | (rx (and ".TH EMACS" (1+ not-newline) | 73 | (rx (and ".TH EMACS" (1+ not-newline) |
| 74 | "GNU Emacs" (1+ space) | 74 | "GNU Emacs" (1+ space) |
| 75 | (submatch (1+ (in "0-9.")))))) | 75 | (submatch (1+ (in "0-9.")))))) |
| 76 | (set-version-in-file root "lib-src/makefile.w32-in" version | 76 | (set-version-in-file root "nt/config.nt" version |
| 77 | (rx (and "VERSION" (0+ space) "=" (0+ space) | 77 | (rx (and bol "#" (0+ blank) "define" (1+ blank) |
| 78 | "VERSION" (1+ blank) | ||
| 78 | (submatch (1+ (in "0-9.")))))) | 79 | (submatch (1+ (in "0-9.")))))) |
| 79 | (set-version-in-file root "nt/makefile.w32-in" version | 80 | (set-version-in-file root "nt/makefile.w32-in" version |
| 80 | (rx (and "VERSION" (0+ space) "=" (0+ space) | 81 | (rx (and "VERSION" (0+ space) "=" (0+ space) |