summaryrefslogtreecommitdiff
path: root/lisp/version.el
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@raeburn.org>2010-05-15 17:11:37 -0400
committerKen Raeburn <raeburn@raeburn.org>2010-05-15 17:11:37 -0400
commit8c5ff6dd241db176fb178b4d84dbab93ad2475c9 (patch)
tree4c52177fac2371274af2370992edfb8353936e3c /lisp/version.el
parent2e9abc3d5340f07c181d3cbeba5d92d36dea5a34 (diff)
downloademacs-8c5ff6dd241db176fb178b4d84dbab93ad2475c9.tar.gz
Handle --version reasonably in CANNOT_DUMP configuration.
* src/emacs.c (emacs_version, emacs_copyright): New string variables. (Vemacs_version, Vemacs_copyright): New Lisp_Object variables. (syms_of_emacs): Defvar them, and initialize them from the C string variables. (main): If initialization hasn't been done, print initial version info from the C strings, instead of starting an interactive session. * lisp/version.el (emacs-copyright, emacs-version): Don't define here. * configure.in: Look for version string in its new place.
Diffstat (limited to 'lisp/version.el')
-rw-r--r--lisp/version.el6
1 files changed, 0 insertions, 6 deletions
diff --git a/lisp/version.el b/lisp/version.el
index 5cd0cc8d634..770409b9487 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -29,12 +29,6 @@
;;; Code:
-(defconst emacs-copyright "Copyright (C) 2010 Free Software Foundation, Inc." "\
-Short copyright string for this version of Emacs.")
-
-(defconst emacs-version "24.0.50" "\
-Version numbers 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.")