(tildify-ignored-environments-alist): Recognize \verb* right.

[gnu-emacs] / lisp / version.el

diff --git a/lisp/version.el b/lisp/version.el
index 7b4dbf5a63d0f91e5b7463deb5009dc7e76804ea..6014df807fd0a9787cb164cc5a7e4dade8ef5508 100644 (file)
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -1,6 +1,6 @@
 ;;; version.el --- record version number of Emacs.
 
-;;; Copyright (C) 1985, 1992, 1994, 1995, 1999, 2000
+;;; Copyright (C) 1985, 1992, 1994, 1995, 1999, 2000, 2001
 ;;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
@@ -25,7 +25,7 @@
 
 ;;; Code:
 
-(defconst emacs-version "21.0.94" "\
+(defconst emacs-version "21.0.104" "\
 Version numbers of this version of Emacs.")
 
 (defconst emacs-major-version
@@ -53,13 +53,19 @@ 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")
+                (cond ((featurep 'motif) 
+                       (concat ", " (substring motif-version-string 4)))
                       ((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