(emacs-version): Revert 2007-08-29 change: no need to say if multi-tty

is present.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 99e7af00446fa4b458f16447fc25d59610ef366c..2dbe0d8bbacef3c2d2acdbf62986c1c4ebda3866 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,18 @@
+2007-09-07  Johannes Weiner  <hannes@saeurebad.de>
+
+       * net/browse-url.el (browse-url-browser-function): Add elinks.
+       (browse-url-elinks-wrapper): New option.
+       (browse-url-encode-url, browse-url-elinks)
+       (browse-url-elinks-sentinel): New functions.
+       (browse-url-file-url, browse-url-netscape, browse-url-mozilla)
+       (browse-url-firefox, browse-url-galeon, browse-url-epiphany): Use
+       new function browse-url-encode-url.
+
+2007-09-07  Glenn Morris  <rgm@gnu.org>
+
+       * version.el (emacs-version): Revert 2007-08-29 change: no need to
+       say if multi-tty is present.
+
 2007-09-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * cus-start.el (split-window-preferred-function): Add custom info.
@@ -363,6 +378,8 @@
 
 2007-08-29  Karoly Lorentey  <lorentey@elte.hu>
 
+       * version.el (emacs-version): Show if multi-tty is present.
+
        * loadup.el: Delay loading env; mule-conf gets confused by cl
        during bootstrap.  Also load termdev and term/x-win.
 

diff --git a/lisp/version.el b/lisp/version.el
index f583ccbbf32b9eeb3a0c4d5b60c5811cd38a3915..6d82b194ff89f176f5bc0aa9fb71daebfa84c6ce 100644 (file)
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -58,8 +58,8 @@ to the system configuration; look at `system-configuration' instead."
   (interactive "P")
   (let ((version-string
          (format (if (not (interactive-p))
-                    "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)\n of %s on %s"
+                  "GNU Emacs %s (%s%s%s) of %s on %s")
                  emacs-version
                 system-configuration
                 (cond ((featurep 'motif)
@@ -75,7 +75,6 @@ to the system configuration; look at `system-configuration' instead."
                     (format ", %s scroll bars"
                             (capitalize (symbol-name x-toolkit-scroll-bars)))
                   "")
-                (if (featurep 'multi-tty) ", multi-tty" "")
                 (format-time-string "%Y-%m-%d" emacs-build-time)
                  emacs-build-system)))
     (if here