diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2018-11-10 16:03:12 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2018-11-10 16:03:12 +0100 |
| commit | a062fc4137ff195fe269076cda07a61c2e1a8012 (patch) | |
| tree | c1ca66b9f322fd9db69baaa1e0c47444931527d7 /lisp/loadup.el | |
| parent | 55f3f21b39389263d707b091d7e1b45d295a149c (diff) | |
| download | emacs-a062fc4137ff195fe269076cda07a61c2e1a8012.tar.gz | |
Provide branch information for both Emacs and Tramp (Bug#33328)
* doc/lispref/intro.texi (Version Info):
Document `emacs-repository-version' and `emacs-repository-branch'.
* etc/NEWS: Mention `emacs-repository-branch'.
* lisp/loadup.el: Initialize `emacs-repository-branch'.
* lisp/version.el (emacs-repository-branch): New variable.
(emacs-repository-branch-git, emacs-repository-get-branch):
New defuns.
* lisp/mail/emacsbug.el (report-emacs-bug):
Insert `emacs-repository-branch'.
* lisp/net/tramp.el (tramp-get-local-gid):
Use `group-name' if available.
(tramp-debug-message):
* lisp/net/tramp-cmds.el (tramp-bug): Report also
`tramp-repository-branch' and `tramp-repository-version'.
* lisp/net/trampver.el (tramp-repository-branch)
(tramp-repository-version): New defconst.
(tramp-repository-get-version): Remove.
Diffstat (limited to 'lisp/loadup.el')
| -rw-r--r-- | lisp/loadup.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el index 5ecfae170fc..eb663538a3b 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -368,8 +368,8 @@ lost after dumping"))) (string-to-number (substring name (length base) exelen)))) files))) - (setq emacs-repository-version (condition-case nil (emacs-repository-get-version) - (error nil))) + (setq emacs-repository-version (ignore-errors (emacs-repository-get-version)) + emacs-repository-branch (ignore-errors (emacs-repository-get-branch))) ;; A constant, so we shouldn't change it with `setq'. (defconst emacs-build-number (if versions (1+ (apply 'max versions)) 1)))) |