diff options
| author | Joakim Verona | 2010-08-27 10:58:44 +0200 |
|---|---|---|
| committer | Joakim Verona | 2010-08-27 10:58:44 +0200 |
| commit | 362120833bcbbaea94976b6701633e2ed75f6051 (patch) | |
| tree | 632690a24a934bb51a32303add5172d63b6b9e00 /admin/admin.el | |
| parent | 1800c4865b15a9e1154bf1f03d87d1aaf750a527 (diff) | |
| parent | 1a868076f51b5d6f1cf78117463e6f9c614551ec (diff) | |
| download | emacs-362120833bcbbaea94976b6701633e2ed75f6051.tar.gz emacs-362120833bcbbaea94976b6701633e2ed75f6051.zip | |
merge from trunk, fix conflicts
Diffstat (limited to 'admin/admin.el')
| -rw-r--r-- | admin/admin.el | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/admin/admin.el b/admin/admin.el index f2cf008f475..51bbecf4c57 100644 --- a/admin/admin.el +++ b/admin/admin.el | |||
| @@ -95,6 +95,9 @@ Root must be the root of an Emacs source tree." | |||
| 95 | (set-version-in-file root "lib-src/makefile.w32-in" version | 95 | (set-version-in-file root "lib-src/makefile.w32-in" version |
| 96 | (rx (and "VERSION" (0+ space) "=" (0+ space) | 96 | (rx (and "VERSION" (0+ space) "=" (0+ space) |
| 97 | (submatch (1+ (in "0-9.")))))) | 97 | (submatch (1+ (in "0-9.")))))) |
| 98 | (set-version-in-file root "nt/makefile.w32-in" version | ||
| 99 | (rx (and "VERSION" (0+ space) "=" (0+ space) | ||
| 100 | (submatch (1+ (in "0-9.")))))) | ||
| 98 | ;; nt/emacs.rc also contains the version number, but in an awkward | 101 | ;; nt/emacs.rc also contains the version number, but in an awkward |
| 99 | ;; format. It must contain four components, separated by commas, and | 102 | ;; format. It must contain four components, separated by commas, and |
| 100 | ;; in two places those commas are followed by space, in two other | 103 | ;; in two places those commas are followed by space, in two other |