Merged in changes from CVS trunk.

[gnu-emacs] / lisp / version.el

diff --git a/lisp/version.el b/lisp/version.el
index ff90d1fd1e80d1430051b9b9f7c6a9e65be5ecb7..6c99d8de1d64d5f4b92efc8f21f1bee5acfee55a 100644 (file)
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -55,19 +55,22 @@ 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)\n of %s on %s"
-                  "GNU Emacs %s (%s%s%s) of %s on %s")
+                    "GNU Emacs %s (%s%s%s%s)\n of %s on %s"
+                  "GNU Emacs %s (%s%s%s%s) of %s on %s")
                  emacs-version
                 system-configuration
                 (cond ((featurep 'motif)
                        (concat ", " (substring motif-version-string 4)))
                       ((featurep 'x-toolkit) ", X toolkit")
+                      ((featurep 'gtk)
+                       (concat ", GTK+ Version " gtk-version-string))
                       (t ""))
                 (if (and (boundp 'x-toolkit-scroll-bars)
                          (memq x-toolkit-scroll-bars '(xaw xaw3d)))
                     (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
@@ -88,4 +91,5 @@ to the system configuration; look at `system-configuration' instead."
 ;;version-control: never
 ;;End:
 
+;;; arch-tag: e60dc445-6218-4a4c-a7df-f15a818642a0
 ;;; version.el ends here