diff options
| author | Xue Fuqiao | 2013-12-26 06:27:00 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2013-12-26 06:27:00 +0800 |
| commit | 77bbf3713d459c45492e6daed68437edcf863a0c (patch) | |
| tree | 0e2ea82f80e907cea52eb683a362504a3813a463 /admin/admin.el | |
| parent | 3bc1e1880f232ccaea7c35a0c51bac61df9ac23c (diff) | |
| parent | 83fa295c1236aba5a73d565082dcb58a32f3e446 (diff) | |
| download | emacs-77bbf3713d459c45492e6daed68437edcf863a0c.tar.gz emacs-77bbf3713d459c45492e6daed68437edcf863a0c.zip | |
Merge from mainline.
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 baf18992953..5e5e57cb3ce 100644 --- a/admin/admin.el +++ b/admin/admin.el | |||
| @@ -75,6 +75,9 @@ Root must be the root of an Emacs source tree." | |||
| 75 | (interactive "DEmacs root directory: \nsVersion number: ") | 75 | (interactive "DEmacs root directory: \nsVersion number: ") |
| 76 | (unless (file-exists-p (expand-file-name "src/emacs.c" root)) | 76 | (unless (file-exists-p (expand-file-name "src/emacs.c" root)) |
| 77 | (user-error "%s doesn't seem to be the root of an Emacs source tree" root)) | 77 | (user-error "%s doesn't seem to be the root of an Emacs source tree" root)) |
| 78 | ;; There's also a "version 3" (standing for GPLv3) at the end of | ||
| 79 | ;; `README', but since `set-version-in-file' only replaces the first | ||
| 80 | ;; occurence, it won't be replaced. | ||
| 78 | (set-version-in-file root "README" version | 81 | (set-version-in-file root "README" version |
| 79 | (rx (and "version" (1+ space) | 82 | (rx (and "version" (1+ space) |
| 80 | (submatch (1+ (in "0-9.")))))) | 83 | (submatch (1+ (in "0-9.")))))) |