X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/fc87a966be1954ece5234cd8be11a28645c3a7b9..d36069f0e74edd9c8237db016e823da21ce332a8:/lisp/version.el

diff --git a/lisp/version.el b/lisp/version.el
index 66d61b2f5d..d4b8194775 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -1,7 +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, 2000
-;;;   Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1992, 1994, 1995, 1999, 2000, 2001, 2002,
+;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
@@ -20,12 +20,14 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
 
 ;;; Code:
 
-(defconst emacs-version "21.0.94" "\
+(defconst emacs-version "22.0.50" "\
 Version numbers of this version of Emacs.")
 
 (defconst emacs-major-version
@@ -45,39 +47,48 @@ Time at which Emacs was dumped out.")
 
 (defconst emacs-build-system (system-name))
 
-(defun emacs-version  (&optional here) "\
+(defun emacs-version (&optional here) "\
 Return string describing the version of Emacs that is running.
 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 'gtk)
+			(concat ", GTK+ Version " gtk-version-string))
 		       ((featurep 'x-toolkit) ", X toolkit")
 		       (t ""))
-		 (format-time-string "%a %Y-%m-%d" 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))
+    (purecopy (concat "\n$Id: " (subst-char-in-string ?\n ?\s (emacs-version))
 		      " $\n")))
 
 ;;Local variables:
 ;;version-control: never
 ;;End:
 
+;;; arch-tag: e60dc445-6218-4a4c-a7df-f15a818642a0
 ;;; version.el ends here