From 5a133ba0785b756a3f479ec8acf95ca3f2b48c92 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 24 Aug 2015 00:27:53 -0700 Subject: [PATCH] * lisp/version.el (emacs-version): No longer include build host * doc/lispref/intro.texi (Version Info): Update example. --- doc/lispref/intro.texi | 4 ++-- lisp/version.el | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/doc/lispref/intro.texi b/doc/lispref/intro.texi index 14bdbdbcd36..0db464ebd2e 100644 --- a/doc/lispref/intro.texi +++ b/doc/lispref/intro.texi @@ -480,8 +480,8 @@ running. It is useful to include this string in bug reports. @smallexample @group (emacs-version) - @result{} "GNU Emacs 23.1 (i686-pc-linux-gnu, GTK+ Version 2.14.4) - of 2009-06-01 on cyd.mit.edu" + @result{} "GNU Emacs 24.5.1 (x86_64-unknown-linux-gnu, GTK+ Version 3.16.4) + of 2015-06-01" @end group @end smallexample diff --git a/lisp/version.el b/lisp/version.el index c0b975ed31b..43103fde131 100644 --- a/lisp/version.el +++ b/lisp/version.el @@ -41,6 +41,8 @@ This variable first existed in version 19.23.") (defconst emacs-build-time (current-time) "Time at which Emacs was dumped out.") +;; I think this should be obsoleted/removed. It's just one more meaningless +;; difference between different builds. It's usually not even an fqdn. (defconst emacs-build-system (system-name) "Name of the system on which Emacs was built.") @@ -57,8 +59,8 @@ to the system configuration; look at `system-configuration' instead." (interactive "P") (let ((version-string (format (if (not (called-interactively-p 'interactive)) - "GNU Emacs %s (%s%s%s%s)\n of %s on %s" - "GNU Emacs %s (%s%s%s%s) of %s on %s") + "GNU Emacs %s (%s%s%s%s)\n of %s" + "GNU Emacs %s (%s%s%s%s) of %s") emacs-version system-configuration (cond ((featurep 'motif) @@ -77,8 +79,7 @@ to the system configuration; look at `system-configuration' instead." (format ", %s scroll bars" (capitalize (symbol-name x-toolkit-scroll-bars))) "") - (format-time-string "%Y-%m-%d" emacs-build-time) - emacs-build-system))) + (format-time-string "%Y-%m-%d" emacs-build-time)))) (if here (insert version-string) (if (called-interactively-p 'interactive) -- 2.11.4.GIT