HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from emacs-23; up to 2012-01-19T07:15:48Z!rgm@gnu.org.
[bpt/emacs.git]
/
lisp
/
version.el
diff --git
a/lisp/version.el
b/lisp/version.el
index
770409b
..
bd30f0f
100644
(file)
--- a/
lisp/version.el
+++ b/
lisp/version.el
@@
-1,11
+1,11
@@
-;;; 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, 2000, 2001, 2002, 2003,
-;; 2004, 2005, 2006, 2007, 2008, 2009, 2010
+;; Copyright (C) 1985, 1992, 1994-1995, 1999-2012
;; Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: internal
;; Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: internal
+;; Package: emacs
;; This file is part of GNU Emacs.
;; This file is part of GNU Emacs.
@@
-40,7
+40,8
@@
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))
+(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.
@@
-83,9
+84,9
@@
to the system configuration; look at `system-configuration' instead."
(purecopy (concat "\n$Id: " (subst-char-in-string ?\n ?\s (emacs-version))
" $\n")))
(purecopy (concat "\n$Id: " (subst-char-in-string ?\n ?\s (emacs-version))
" $\n")))
-;;Local variables:
-;;version-control: never
-;;End:
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; End:
-;; arch-tag: e60dc445-6218-4a4c-a7df-f15a818642a0
;;; version.el ends here
;;; version.el ends here