aboutsummaryrefslogtreecommitdiffstats
path: root/doc/lispref/ChangeLog
diff options
context:
space:
mode:
authorChong Yidong2011-01-02 15:31:19 -0500
committerChong Yidong2011-01-02 15:31:19 -0500
commit7c420169baa7c50428589cca7f8eda71b462eb15 (patch)
treeb556f9e181818bbaf8b5b425844b4ae26e88f537 /doc/lispref/ChangeLog
parentbb7f5cbcda931661c8dc3311603ac764fa87a639 (diff)
parentd12f22f52cb7bb18b46f5ea8de5d8e8e04733e3f (diff)
downloademacs-7c420169baa7c50428589cca7f8eda71b462eb15.tar.gz
emacs-7c420169baa7c50428589cca7f8eda71b462eb15.zip
Merge changes from emacs-23 branch
Diffstat (limited to 'doc/lispref/ChangeLog')
-rw-r--r--doc/lispref/ChangeLog9
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 157c8580b9c..7307d7fab4f 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,12 @@
12011-01-02 Eli Zaretskii <eliz@gnu.org>
2
3 * modes.texi (Emulating Mode Line): Fix last change.
4
52011-01-02 Eli Zaretskii <eliz@gnu.org>
6
7 * modes.texi (Emulating Mode Line): Update documentation of
8 format-mode-line according to changes that fixed bug #7587.
9
12010-12-18 Stefan Monnier <monnier@iro.umontreal.ca> 102010-12-18 Stefan Monnier <monnier@iro.umontreal.ca>
2 11
3 * modes.texi (Derived Modes): Mention prog-mode. 12 * modes.texi (Derived Modes): Mention prog-mode.