emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r108367: There's no reason not to com


From: Glenn Morris
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r108367: There's no reason not to compile version.el
Date: Fri, 25 May 2012 14:57:51 -0400
User-agent: Bazaar (2.5.0)

------------------------------------------------------------
revno: 108367
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2012-05-25 14:57:51 -0400
message:
  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.
modified:
  lisp/ChangeLog
  lisp/loadup.el
  lisp/version.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-05-25 14:47:57 +0000
+++ b/lisp/ChangeLog    2012-05-25 18:57:51 +0000
@@ -1,3 +1,9 @@
+2012-05-25  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * progmodes/gdb-mi.el: Minor style changes.

=== modified file 'lisp/loadup.el'
--- a/lisp/loadup.el    2012-05-07 20:48:41 +0000
+++ b/lisp/loadup.el    2012-05-25 18:57:51 +0000
@@ -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")

=== modified file 'lisp/version.el'
--- a/lisp/version.el   2012-05-24 06:38:41 +0000
+++ b/lisp/version.el   2012-05-25 18:57:51 +0000
@@ -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.
-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.
-This variable first existed in version 19.23.")
-
-(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.")
-
-(defun emacs-version (&optional here) "\
-Return string describing the version of Emacs that is running.
+(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.
+This variable first existed in version 19.23.")
+
+(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.")
+
+(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 @@
 (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


reply via email to

[Prev in Thread] Current Thread [Next in Thread]