Place empty abbrev tables after nonempty ones when editing

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

diff --git a/lisp/version.el b/lisp/version.el
index dda8611..d28a300 100644 (file)
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -1,11 +1,11 @@
 ;;; 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, 2009
+;; Copyright (C) 1985, 1992, 1994-1995, 1999-2011
 ;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
+;; Package: emacs
 
 ;; This file is part of GNU Emacs.
 
@@ -24,24 +24,17 @@
 
 ;;; Commentary:
 
-;;; Code:
-
-(defconst emacs-copyright "Copyright (C) 2009 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.92" "\
-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) "\
@@ -56,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
@@ -78,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))))
 
@@ -94,5 +87,4 @@ to the system configuration; look at `system-configuration' instead."
 ;;version-control: never
 ;;End:
 
-;; arch-tag: e60dc445-6218-4a4c-a7df-f15a818642a0
 ;;; version.el ends here