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

1 files changed, 7 insertions, 2 deletions

diff --git a/lisp/version.el b/lisp/version.el
index d2dc8518a7d..b90ce7ffad7 100644
--- 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