aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorGlenn Morris2017-02-17 20:15:21 -0500
committerGlenn Morris2017-02-17 20:15:21 -0500
commit22b2207471807bda86534b4faf1a29b3a6447536 (patch)
tree79f65cff576fe028b6556fc2763579a36610d7e7 /admin
parent8675f9c8b8a002530d0c4e0263bb3d4cf3a649fa (diff)
downloademacs-22b2207471807bda86534b4faf1a29b3a6447536.tar.gz
emacs-22b2207471807bda86534b4faf1a29b3a6447536.zip
Remove the build number from emacs-version variable
It's a largely internal detail that can confuse users. (Bug#25590) * lisp/version.el (emacs-build-number): New constant. (emacs-version): Use emacs-build-number. * lisp/loadup.el (top-level): When dumping, increment emacs-build-number rather than emacs-version. * src/emacs.c (emacs-version): Doc fix. * doc/lispref/intro.texi (Version Info): Update emacs-version details. Mention emacs-build-number. * lisp/gnus/gnus-util.el (gnus-emacs-version): * lisp/mail/emacsbug.el (report-emacs-bug): * admin/admin.el (set-version): Update for emacs-version change. ; * etc/NEWS: Mention this.
Diffstat (limited to 'admin')
-rw-r--r--admin/admin.el4
1 files changed, 1 insertions, 3 deletions
diff --git a/admin/admin.el b/admin/admin.el
index 4892045a690..a6ef19c9aba 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -93,9 +93,7 @@ Optional argument DATE is the release date, default today."
93Root must be the root of an Emacs source tree." 93Root must be the root of an Emacs source tree."
94 (interactive (list 94 (interactive (list
95 (read-directory-name "Emacs root directory: " source-directory) 95 (read-directory-name "Emacs root directory: " source-directory)
96 (read-string "Version number: " 96 (read-string "Version number: " emacs-version)))
97 (replace-regexp-in-string "\\.[0-9]+\\'" ""
98 emacs-version))))
99 (unless (file-exists-p (expand-file-name "src/emacs.c" root)) 97 (unless (file-exists-p (expand-file-name "src/emacs.c" root))
100 (user-error "%s doesn't seem to be the root of an Emacs source tree" root)) 98 (user-error "%s doesn't seem to be the root of an Emacs source tree" root))
101 (message "Setting version numbers...") 99 (message "Setting version numbers...")