(match-string-no-properties): Use substring-no-properties.

[gnu-emacs] / lisp / version.el

diff --git a/lisp/version.el b/lisp/version.el
index 1c86b576981c9a762ba37f0438cbbb85fb9f12ca..42dbb3f9c2565e7a22e9d0a18ebf436f77207d99 100644 (file)
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -1,6 +1,7 @@
-;;; version.el --- record version number of Emacs.
+;;; version.el --- record version number of Emacs -*- no-byte-compile: t -*-
 
-;;; Copyright (C) 1985, 1992, 1994, 1995, 1999 Free Software Foundation, Inc.
+;;; Copyright (C) 1985, 1992, 1994, 1995, 1999, 2000, 2001
+;;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
@@ -22,9 +23,11 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
+;;; Commentary:
+
 ;;; Code:
 
-(defconst emacs-version "20.5.92" "\
+(defconst emacs-version "21.3.50" "\
 Version numbers of this version of Emacs.")
 
 (defconst emacs-major-version
@@ -50,27 +53,35 @@ If optional argument HERE is non-nil, insert string at point.
 Don't use this function in programs to choose actions according
 to the system configuration; look at `system-configuration' instead."
   (interactive "P")
-  (let ((version-string 
+  (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")
+                      ((featurep 'gtk)
+                       (concat ", GTK+ Version " gtk-version-string))
                       (t ""))
-                (format-time-string "%a %b %e %Y" emacs-build-time)
+                (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 
+    (if here
         (insert version-string)
       (if (interactive-p)
           (message "%s" version-string)
         version-string))))
 
-;;; We hope that this alias is easier for people to find.
+;; We hope that this alias is easier for people to find.
 (defalias 'version 'emacs-version)
 
-;;; We put version info into the executable in the form that ident(1) uses.
+;; We put version info into the executable in the form that `ident' uses.
 (or (memq system-type '(vax-vms windows-nt))
     (purecopy (concat "\n$Id: " (subst-char-in-string ?\n ? (emacs-version))
                      " $\n")))
@@ -79,4 +90,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