Merge changes from emacs-23 branch.

[bpt/emacs.git] / lisp / version.el

diff --git a/lisp/version.el b/lisp/version.el
index 5f136a5..770409b 100644 (file)
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -1,7 +1,8 @@
 ;;; version.el --- record version number of Emacs -*- no-byte-compile: t -*-
 
-;; Copyright (C) 1985, 1992, 1994, 1995, 1999, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1992, 1994, 1995, 1999, 2000, 2001, 2002, 2003,
+;;   2004, 2005, 2006, 2007, 2008, 2009, 2010
+;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
@@ -23,24 +24,17 @@
 
 ;;; Commentary:
 
-;;; Code:
-
-(defconst emacs-copyright "Copyright (C) 2008 Free Software Foundation, Inc."
-  "Short copyright string for this version of Emacs.")
+;; This file is loaded uncompiled when dumping Emacs.
+;; Doc-strings should adhere to the conventions of make-docfile.
 
-(defconst emacs-version "23.0.60" "\
-Version numbers of this version of Emacs.")
+;;; Code:
 
-(defconst emacs-major-version
-  (progn (string-match "^[0-9]+" emacs-version)
-        (string-to-number (match-string 0 emacs-version)))
-  "Major version number of this version of Emacs.
+(defconst emacs-major-version (progn (string-match "^[0-9]+" emacs-version) (string-to-number (match-string 0 emacs-version))) "\
+Major version number of this version of Emacs.
 This variable first existed in version 19.23.")
 
-(defconst emacs-minor-version
-  (progn (string-match "^[0-9]+\\.\\([0-9]+\\)" emacs-version)
-        (string-to-number (match-string 1 emacs-version)))
-  "Minor version number of this version of Emacs.
+(defconst emacs-minor-version (progn (string-match "^[0-9]+\\.\\([0-9]+\\)" emacs-version) (string-to-number (match-string 1 emacs-version))) "\
+Minor version number of this version of Emacs.
 This variable first existed in version 19.23.")
 
 (defconst emacs-build-time (current-time) "\
@@ -55,7 +49,7 @@ 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
-         (format (if (not (interactive-p))
+         (format (if (not (called-interactively-p 'interactive))
                     "GNU Emacs %s (%s%s%s)\n of %s on %s"
                   "GNU Emacs %s (%s%s%s) of %s on %s")
                  emacs-version
@@ -65,10 +59,8 @@ to the system configuration; look at `system-configuration' instead."
                       ((featurep 'gtk)
                        (concat ", GTK+ Version " gtk-version-string))
                       ((featurep 'x-toolkit) ", X toolkit")
-                      ((featurep 'ns-windowing)
-                       (format ", *Step %s" ns-version-string))
-                      ((boundp 'mac-carbon-version-string)
-                       (concat ", Carbon Version " mac-carbon-version-string))
+                      ((featurep 'ns)
+                       (format ", NS %s" ns-version-string))
                       (t ""))
                 (if (and (boundp 'x-toolkit-scroll-bars)
                          (memq x-toolkit-scroll-bars '(xaw xaw3d)))
@@ -79,7 +71,7 @@ to the system configuration; look at `system-configuration' instead."
                  emacs-build-system)))
     (if here
         (insert version-string)
-      (if (interactive-p)
+      (if (called-interactively-p 'interactive)
           (message "%s" version-string)
         version-string))))
 
@@ -87,7 +79,7 @@ to the system configuration; look at `system-configuration' instead."
 (defalias 'version 'emacs-version)
 
 ;; We put version info into the executable in the form that `ident' uses.
-(or (memq system-type '(vax-vms windows-nt))
+(or (eq system-type 'windows-nt)
     (purecopy (concat "\n$Id: " (subst-char-in-string ?\n ?\s (emacs-version))
                      " $\n")))