summaryrefslogtreecommitdiff
path: root/lisp/mail/emacsbug.el
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2018-11-10 16:03:12 +0100
committerMichael Albinus <michael.albinus@gmx.de>2018-11-10 16:03:12 +0100
commita062fc4137ff195fe269076cda07a61c2e1a8012 (patch)
treec1ca66b9f322fd9db69baaa1e0c47444931527d7 /lisp/mail/emacsbug.el
parent55f3f21b39389263d707b091d7e1b45d295a149c (diff)
downloademacs-a062fc4137ff195fe269076cda07a61c2e1a8012.tar.gz
emacs-a062fc4137ff195fe269076cda07a61c2e1a8012.tar.bz2
emacs-a062fc4137ff195fe269076cda07a61c2e1a8012.zip
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/mail/emacsbug.el')
-rw-r--r--lisp/mail/emacsbug.el2
1 files changed, 2 insertions, 0 deletions
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index 8cacad8726d..e55f950aac3 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -307,6 +307,8 @@ usually do not have translators for other languages.\n\n")))
(if (stringp emacs-repository-version)
(insert "Repository revision: " emacs-repository-version "\n"))
+ (if (stringp emacs-repository-branch)
+ (insert "Repository branch: " emacs-repository-branch "\n"))
(if (fboundp 'x-server-vendor)
(condition-case nil
;; This is used not only for X11 but also W32 and others.