aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2011-11-23 23:24:31 -0800
committerGlenn Morris2011-11-23 23:24:31 -0800
commitcb825e5d7b3f73eb393ba98ac25ed51597de6528 (patch)
tree17a86c299524b22deedbc099e065c16c1ce07205
parenta0649f084c2e1829a8479ddb2145ad100e90f9a1 (diff)
downloademacs-cb825e5d7b3f73eb393ba98ac25ed51597de6528.tar.gz
emacs-cb825e5d7b3f73eb393ba98ac25ed51597de6528.zip
* lisp/version.el (emacs-build-system): Give it a doc-string.
Consolidate local variables at the end of the file.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/version.el12
2 files changed, 11 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6fc7264b4e0..6bfdf627e7e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12011-11-24 Glenn Morris <rgm@gnu.org>
2
3 * version.el (emacs-build-system): Give it a doc-string.
4
12011-11-24 Juri Linkov <juri@jurta.org> 52011-11-24 Juri Linkov <juri@jurta.org>
2 6
3 * view.el (view-buffer): Revert 2011-07-19T15:01:49Z!larsi@gnus.org from 2011-07-19 (bug#8615). 7 * view.el (view-buffer): Revert 2011-07-19T15:01:49Z!larsi@gnus.org from 2011-07-19 (bug#8615).
diff --git a/lisp/version.el b/lisp/version.el
index d28a3004585..aa4e22469c5 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-2011 3;; Copyright (C) 1985, 1992, 1994-1995, 1999-2011
4;; Free Software Foundation, Inc. 4;; Free Software Foundation, Inc.
@@ -40,7 +40,8 @@ This variable first existed in version 19.23.")
40(defconst emacs-build-time (current-time) "\ 40(defconst emacs-build-time (current-time) "\
41Time at which Emacs was dumped out.") 41Time at which Emacs was dumped out.")
42 42
43(defconst emacs-build-system (system-name)) 43(defconst emacs-build-system (system-name) "\
44Name of the system on which Emacs was built.")
44 45
45(defun emacs-version (&optional here) "\ 46(defun emacs-version (&optional here) "\
46Return string describing the version of Emacs that is running. 47Return string describing the version of Emacs that is running.
@@ -83,8 +84,9 @@ to the system configuration; look at `system-configuration' instead."
83 (purecopy (concat "\n$Id: " (subst-char-in-string ?\n ?\s (emacs-version)) 84 (purecopy (concat "\n$Id: " (subst-char-in-string ?\n ?\s (emacs-version))
84 " $\n"))) 85 " $\n")))
85 86
86;;Local variables: 87;; Local Variables:
87;;version-control: never 88;; version-control: never
88;;End: 89;; no-byte-compile: t
90;; End:
89 91
90;;; version.el ends here 92;;; version.el ends here