diff options
| author | Glenn Morris <rgm@gnu.org> | 2017-02-17 20:15:21 -0500 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2017-02-17 20:15:21 -0500 |
| commit | 22b2207471807bda86534b4faf1a29b3a6447536 (patch) | |
| tree | 79f65cff576fe028b6556fc2763579a36610d7e7 /lisp/loadup.el | |
| parent | 8675f9c8b8a002530d0c4e0263bb3d4cf3a649fa (diff) | |
| download | emacs-22b2207471807bda86534b4faf1a29b3a6447536.tar.gz | |
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 'lisp/loadup.el')
| -rw-r--r-- | lisp/loadup.el | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el index ecb72840c43..5b19b05a82e 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -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))) |