mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Remove the build number from emacs-version variable

Browse source 
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.
This commit is contained in:
Glenn Morris 2017-02-17 20:15:21 -05:00
parent 8675f9c8b8
commit 22b2207471
8 changed files with 38 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lisp/loadup.el
View file

@ -350,7 +350,7 @@ lost after dumping")))
(multibyte-string-p default-directory))
(error "default-directory must be unibyte when dumping Emacs!"))
;; Determine which last version number to use
;; Determine which build number to use
;; based on the executables that now exist.
(if (and (equal (last command-line-args) '("dump"))
(not (eq system-type 'ms-dos)))
@ -364,10 +364,9 @@ lost after dumping")))
files)))
(setq emacs-repository-version (condition-case nil (emacs-repository-get-version)
(error nil)))
;; `emacs-version' is a constant, so we shouldn't change it with `setq'.
(defconst emacs-version
(format "%s.%d"
emacs-version (if versions (1+ (apply 'max versions)) 1)))))
;; A constant, so we shouldn't change it with `setq'.
(defconst emacs-build-number
(if versions (1+ (apply 'max versions)) 1))))
(message "Finding pointers to doc strings...")
@ -463,7 +462,7 @@ lost after dumping")))
;; Don't bother adding another name if we're just
;; building bootstrap-emacs.
(equal (last command-line-args) '("bootstrap"))))
(let ((name (concat "emacs-" emacs-version))
(let ((name (format "emacs-%s.%d" emacs-version emacs-build-number))
(exe (if (eq system-type 'windows-nt) ".exe" "")))
(while (string-match "[^-+_.a-zA-Z0-9]+" name)
(setq name (concat (downcase (substring name 0 (match-beginning 0)))