aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorGerd Moellmann2000-12-23 15:43:08 +0000
committerGerd Moellmann2000-12-23 15:43:08 +0000
commitbdd6d4e85ce46c027663b23d74fe76f0423738fa (patch)
treec0bcf1ae754366a8be715e2db4548c3cd12ba88a /lisp
parente751216899474a0c4540aacbf137afed3ed68e56 (diff)
downloademacs-bdd6d4e85ce46c027663b23d74fe76f0423738fa.tar.gz
emacs-bdd6d4e85ce46c027663b23d74fe76f0423738fa.zip
*** empty log message ***
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b9d1f3a283a..6ef8d96e82e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12000-12-23 Gerd Moellmann <gerd@gnu.org>
2
3 * progmodes/compile.el (compilation-forget-errors): Fix indentation.
4
12000-12-22 Stefan Monnier <monnier@cs.yale.edu> 52000-12-22 Stefan Monnier <monnier@cs.yale.edu>
2 6
3 * smerge-mode.el (smerge-basic-map): Use `=' rather than `d'. 7 * smerge-mode.el (smerge-basic-map): Use `=' rather than `d'.