summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2012-05-25 14:57:51 -0400
committerGlenn Morris <rgm@gnu.org>2012-05-25 14:57:51 -0400
commit758c81e87ded2bad9f5a5a6683fb498965eb508c (patch)
treef40ccb469e524f81ede749cfa334ad2d7fb3e3d5 /lisp
parent48def666f155f3a102594f3a7d800ae549c36313 (diff)
downloademacs-758c81e87ded2bad9f5a5a6683fb498965eb508c.tar.gz
emacs-758c81e87ded2bad9f5a5a6683fb498965eb508c.tar.bz2
emacs-758c81e87ded2bad9f5a5a6683fb498965eb508c.zip
There's no reason not to compile version.el
AFAICS, this is ancient code dating from when there was an "inc-vers.el", that was used to bump the build number on version.el. Nowadays that happens in loadup.el. * lisp/version.el: Remove no-byte-compile and associated formatting. * lisp/loadup.el: No need to load lisp/version.el uncompiled.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/loadup.el3
-rw-r--r--lisp/version.el37
3 files changed, 26 insertions, 20 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 132a18f7204..b3461821f80 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-25 Glenn Morris <rgm@gnu.org>
+
+ * version.el: Remove no-byte-compile and associated formatting.
+ * loadup.el: No need to load version.el uncompiled. AFAICS, this
+ is ancient code from when there was an "inc-vers.el".
+
2012-05-25 Stefan Monnier <monnier@iro.umontreal.ca>
* progmodes/gdb-mi.el: Minor style changes.
diff --git a/lisp/loadup.el b/lisp/loadup.el
index ab3b107e56c..38c1f82568b 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -83,8 +83,7 @@
;; implemented in subr.el.
(add-hook 'after-load-functions (lambda (f) (garbage-collect)))
-;; We specify .el in case someone compiled version.el by mistake.
-(load "version.el")
+(load "version")
(load "widget")
(load "custom")
diff --git a/lisp/version.el b/lisp/version.el
index 804727a07c2..34b500b8281 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -1,4 +1,4 @@
-;;; version.el --- record version number of Emacs -*- no-byte-compile: t -*-
+;;; version.el --- record version number of Emacs
;; Copyright (C) 1985, 1992, 1994-1995, 1999-2012
;; Free Software Foundation, Inc.
@@ -24,27 +24,28 @@
;;; Commentary:
-;; This file is loaded uncompiled when dumping Emacs.
-;; Doc-strings should adhere to the conventions of make-docfile.
-
;;; 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) "\
-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.")
-(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."
@@ -80,14 +81,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.
-(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.")
-(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