Cleanup intervals.

[gnu-emacs] / lisp / version.el

diff --git a/lisp/version.el b/lisp/version.el
index 38be0e7fd574a10ccac76d8a41a48c9dfbe20d27..e63c51d0d26a2dd52bcc8442e61cc94b2ea3d5ed 100644 (file)
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -24,27 +24,32 @@
 
 ;;; Commentary:
 
 
 ;;; Commentary:
 

-;; This file is loaded uncompiled when dumping Emacs.
-;; Doc-strings should adhere to the conventions of make-docfile.
-

 ;;; Code:
 
 ;;; 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.")
 
 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.")
 
 This variable first existed in version 19.23.")
 

-(defconst emacs-build-time (current-time) "\
-Time at which Emacs was dumped out.")
+(defconst emacs-build-time (current-time)
+  "Time at which Emacs was dumped out.")
+
+(defconst emacs-build-system (system-name)
+  "Name of the system on which Emacs was built.")

 
 

-(defconst emacs-build-system (system-name) "\
-Name of the system on which Emacs was built.")
+(defvar motif-version-string)
+(defvar gtk-version-string)
+(defvar ns-version-string)

 
 

-(defun emacs-version (&optional here) "\
-Return string describing the version of Emacs that is running.
+(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."
 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."


@@ -80,14 +85,14 @@ to the system configuration; look at `system-configuration' instead."
 (defalias 'version 'emacs-version)
 
 ;; Set during dumping, this is a defvar so that it can be setq'd.
 (defalias 'version 'emacs-version)
 
 ;; Set during dumping, this is a defvar so that it can be setq'd.

-(defvar emacs-bzr-version nil "\
-String giving the bzr revision from which this Emacs was built.
+(defvar emacs-bzr-version nil
+  "String giving the bzr revision from which this Emacs was built.

 Value is the bzr revision number and a revision ID separated by a blank.
 Value is nil if Emacs was not built from a bzr checkout, or if we could
 not determine the revision.")
 
 Value is the bzr revision number and a revision ID separated by a blank.
 Value is nil if Emacs was not built from a bzr checkout, or if we could
 not determine the revision.")
 

-(defun emacs-bzr-get-version (&optional dir) "\
-Try to return as a string the bzr revision number of the Emacs sources.
+(defun emacs-bzr-get-version (&optional dir)
+  "Try to return as a string the bzr revision number of the Emacs sources.

 Value is the bzr revision number and a revision ID separated by a blank.
 Value is nil if the sources do not seem to be under bzr, or if we could
 not determine the revision.  Note that this reports on the current state
 Value is the bzr revision number and a revision ID separated by a blank.
 Value is nil if the sources do not seem to be under bzr, or if we could
 not determine the revision.  Note that this reports on the current state


@@ -118,13 +123,7 @@ Optional argument DIR is a directory to use instead of `source-directory'."
             ))))
 
 ;; We put version info into the executable in the form that `ident' uses.
             ))))
 
 ;; We put version info into the executable in the form that `ident' uses.

-(or (eq system-type 'windows-nt)
-    (purecopy (concat "\n$Id: " (subst-char-in-string ?\n ?\s (emacs-version))
-                     " $\n")))
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; End:
+(purecopy (concat "\n$Id: " (subst-char-in-string ?\n ?\s (emacs-version))
+                 " $\n"))

 
 ;;; version.el ends here
 
 ;;; version.el ends here