aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog11
-rw-r--r--lisp/version.el2
2 files changed, 12 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9ff903d2ee9..e7bbc381fb5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
12000-12-18 Gerd Moellmann <gerd@gnu.org>
2
3 * version.el (emacs-version): Remove `%a' from the time format
4 because the weekday doesn't fit well into each locale.
5
62000-12-17 Stefan Monnier <monnier@cs.yale.edu>
7
8 * pcvs.el (cvs-diff-backup-extractor): Return full-path for file.
9 (cvs-execute-single-file): Don't change directory.
10 Patch from Per Cederqvist.
11
12000-12-18 Miles Bader <miles@gnu.org> 122000-12-18 Miles Bader <miles@gnu.org>
2 13
3 * image-file.el (image-file-name-extensions): Add "pgm" and "ppm". 14 * image-file.el (image-file-name-extensions): Add "pgm" and "ppm".
diff --git a/lisp/version.el b/lisp/version.el
index 66d61b2f5d5..7b4dbf5a63d 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -60,7 +60,7 @@ to the system configuration; look at `system-configuration' instead."
60 (cond ((featurep 'motif) ", Motif") 60 (cond ((featurep 'motif) ", Motif")
61 ((featurep 'x-toolkit) ", X toolkit") 61 ((featurep 'x-toolkit) ", X toolkit")
62 (t "")) 62 (t ""))
63 (format-time-string "%a %Y-%m-%d" emacs-build-time) 63 (format-time-string "%Y-%m-%d" emacs-build-time)
64 emacs-build-system))) 64 emacs-build-system)))
65 (if here 65 (if here
66 (insert version-string) 66 (insert version-string)