diff options
| author | Glenn Morris | 2012-05-25 14:57:51 -0400 |
|---|---|---|
| committer | Glenn Morris | 2012-05-25 14:57:51 -0400 |
| commit | 758c81e87ded2bad9f5a5a6683fb498965eb508c (patch) | |
| tree | f40ccb469e524f81ede749cfa334ad2d7fb3e3d5 | |
| parent | 48def666f155f3a102594f3a7d800ae549c36313 (diff) | |
| download | emacs-758c81e87ded2bad9f5a5a6683fb498965eb508c.tar.gz 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.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/loadup.el | 3 | ||||
| -rw-r--r-- | lisp/version.el | 37 |
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 @@ | |||
| 1 | 2012-05-25 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * version.el: Remove no-byte-compile and associated formatting. | ||
| 4 | * loadup.el: No need to load version.el uncompiled. AFAICS, this | ||
| 5 | is ancient code from when there was an "inc-vers.el". | ||
| 6 | |||
| 1 | 2012-05-25 Stefan Monnier <monnier@iro.umontreal.ca> | 7 | 2012-05-25 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 8 | ||
| 3 | * progmodes/gdb-mi.el: Minor style changes. | 9 | * 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 @@ | |||
| 83 | ;; implemented in subr.el. | 83 | ;; implemented in subr.el. |
| 84 | (add-hook 'after-load-functions (lambda (f) (garbage-collect))) | 84 | (add-hook 'after-load-functions (lambda (f) (garbage-collect))) |
| 85 | 85 | ||
| 86 | ;; We specify .el in case someone compiled version.el by mistake. | 86 | (load "version") |
| 87 | (load "version.el") | ||
| 88 | 87 | ||
| 89 | (load "widget") | 88 | (load "widget") |
| 90 | (load "custom") | 89 | (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 @@ | |||
| 1 | ;;; version.el --- record version number of Emacs -*- no-byte-compile: t -*- | 1 | ;;; version.el --- record version number of Emacs |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1985, 1992, 1994-1995, 1999-2012 | 3 | ;; Copyright (C) 1985, 1992, 1994-1995, 1999-2012 |
| 4 | ;; Free Software Foundation, Inc. | 4 | ;; Free Software Foundation, Inc. |
| @@ -24,27 +24,28 @@ | |||
| 24 | 24 | ||
| 25 | ;;; Commentary: | 25 | ;;; Commentary: |
| 26 | 26 | ||
| 27 | ;; This file is loaded uncompiled when dumping Emacs. | ||
| 28 | ;; Doc-strings should adhere to the conventions of make-docfile. | ||
| 29 | |||
| 30 | ;;; Code: | 27 | ;;; Code: |
| 31 | 28 | ||
| 32 | (defconst emacs-major-version (progn (string-match "^[0-9]+" emacs-version) (string-to-number (match-string 0 emacs-version))) "\ | 29 | (defconst emacs-major-version |
| 33 | Major version number of this version of Emacs. | 30 | (progn (string-match "^[0-9]+" emacs-version) |
| 31 | (string-to-number (match-string 0 emacs-version))) | ||
| 32 | "Major version number of this version of Emacs. | ||
| 34 | This variable first existed in version 19.23.") | 33 | This variable first existed in version 19.23.") |
| 35 | 34 | ||
| 36 | (defconst emacs-minor-version (progn (string-match "^[0-9]+\\.\\([0-9]+\\)" emacs-version) (string-to-number (match-string 1 emacs-version))) "\ | 35 | (defconst emacs-minor-version |
| 37 | Minor version number of this version of Emacs. | 36 | (progn (string-match "^[0-9]+\\.\\([0-9]+\\)" emacs-version) |
| 37 | (string-to-number (match-string 1 emacs-version))) | ||
| 38 | "Minor version number of this version of Emacs. | ||
| 38 | This variable first existed in version 19.23.") | 39 | This variable first existed in version 19.23.") |
| 39 | 40 | ||
| 40 | (defconst emacs-build-time (current-time) "\ | 41 | (defconst emacs-build-time (current-time) |
| 41 | Time at which Emacs was dumped out.") | 42 | "Time at which Emacs was dumped out.") |
| 42 | 43 | ||
| 43 | (defconst emacs-build-system (system-name) "\ | 44 | (defconst emacs-build-system (system-name) |
| 44 | Name of the system on which Emacs was built.") | 45 | "Name of the system on which Emacs was built.") |
| 45 | 46 | ||
| 46 | (defun emacs-version (&optional here) "\ | 47 | (defun emacs-version (&optional here) |
| 47 | Return string describing the version of Emacs that is running. | 48 | "Return string describing the version of Emacs that is running. |
| 48 | If optional argument HERE is non-nil, insert string at point. | 49 | If optional argument HERE is non-nil, insert string at point. |
| 49 | Don't use this function in programs to choose actions according | 50 | Don't use this function in programs to choose actions according |
| 50 | to the system configuration; look at `system-configuration' instead." | 51 | to the system configuration; look at `system-configuration' instead." |
| @@ -80,14 +81,14 @@ to the system configuration; look at `system-configuration' instead." | |||
| 80 | (defalias 'version 'emacs-version) | 81 | (defalias 'version 'emacs-version) |
| 81 | 82 | ||
| 82 | ;; Set during dumping, this is a defvar so that it can be setq'd. | 83 | ;; Set during dumping, this is a defvar so that it can be setq'd. |
| 83 | (defvar emacs-bzr-version nil "\ | 84 | (defvar emacs-bzr-version nil |
| 84 | String giving the bzr revision from which this Emacs was built. | 85 | "String giving the bzr revision from which this Emacs was built. |
| 85 | Value is the bzr revision number and a revision ID separated by a blank. | 86 | Value is the bzr revision number and a revision ID separated by a blank. |
| 86 | Value is nil if Emacs was not built from a bzr checkout, or if we could | 87 | Value is nil if Emacs was not built from a bzr checkout, or if we could |
| 87 | not determine the revision.") | 88 | not determine the revision.") |
| 88 | 89 | ||
| 89 | (defun emacs-bzr-get-version (&optional dir) "\ | 90 | (defun emacs-bzr-get-version (&optional dir) |
| 90 | Try to return as a string the bzr revision number of the Emacs sources. | 91 | "Try to return as a string the bzr revision number of the Emacs sources. |
| 91 | Value is the bzr revision number and a revision ID separated by a blank. | 92 | Value is the bzr revision number and a revision ID separated by a blank. |
| 92 | Value is nil if the sources do not seem to be under bzr, or if we could | 93 | Value is nil if the sources do not seem to be under bzr, or if we could |
| 93 | not determine the revision. Note that this reports on the current state | 94 | not determine the revision. Note that this reports on the current state |