Merge from emacs-23 branch.

[bpt/emacs.git] / doc / lispref / ChangeLog

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 2b2cc62..40481ac 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,33 @@
+2011-01-15  Chong Yidong  <cyd@stupidchicken.com>
+
+       * files.texi (Directory Names): Move directory-abbrev-alist doc to
+       Emacs manual.
+
+2011-01-15  Eli Zaretskii  <eliz@gnu.org>
+
+       * files.texi (Directory Names): Explain why FROM in
+       directory-abbrev-alist should begin with \`.  (Bug#7777)
+
+2011-01-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * loading.texi (Hooks for Loading): Adjust doc of eval-after-load.
+
+2011-01-02  Eli Zaretskii  <eliz@gnu.org>
+
+       * modes.texi (Emulating Mode Line): Fix last change.
+
+2011-01-02  Eli Zaretskii  <eliz@gnu.org>
+
+       * modes.texi (Emulating Mode Line): Update documentation of
+       format-mode-line according to changes that fixed bug #7587.
+
+2010-12-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * modes.texi (Derived Modes): Mention prog-mode.
+
+       * keymaps.texi (Simple Menu Items, Extended Menu Items): Remove mention
+       of the key-binding-data cache since we don't use it any more.
+
 2010-12-13  Eli Zaretskii  <eliz@gnu.org>
 
        * processes.texi (Shell Arguments):
@@ -31,6 +61,7 @@
 
        * nonascii.texi (Converting Representations):
        Document byte-to-string.
+
 2010-12-08  Glenn Morris  <rgm@gnu.org>
 
        * buffers.texi (Modification Time):
@@ -8867,7 +8898,7 @@
 ;; End:
 
   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-    2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+    2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.