(emacs-version): Print X scroll bar information.

diff --git a/lisp/version.el b/lisp/version.el
index d2dc8518a7d04415b9c51c0664e2c833260d5dbc..b90ce7ffad745861a8bc651291b159cb29e9faaf 100644 (file)
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -53,13 +53,18 @@ to the system configuration; look at `system-configuration' instead."
   (interactive "P")
   (let ((version-string 
          (format (if (not (interactive-p))
-                    "GNU Emacs %s (%s%s)\n of %s on %s"
-                  "GNU Emacs %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) ", Motif")
                       ((featurep 'x-toolkit) ", X toolkit")
                       (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)))
+                  "")
                 (format-time-string "%Y-%m-%d" emacs-build-time)
                  emacs-build-system)))
     (if here