Merge from emacs-24; up to 2012-12-17T11:17:34Z!rgm@gnu.org

[gnu-emacs] / doc / lispref / ChangeLog

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index a61d84a77b113c389ed61e146109d7ea37b1bb07..be1bdfcfa3d8e034055ae17b3b37401cc3eb0ee3 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,16 @@
+2013-02-13  Glenn Morris  <rgm@gnu.org>
+
+       * objects.texi (Char-Table Type): Add footnote about #^^.
+
+       * modes.texi (Minor Mode Conventions): Fix typo.
+
+       * keymaps.texi (Scanning Keymaps): Remove obsolete sentence about
+       meta characters; this changed in 22.1.  (Bug#13684)
+
+       * objects.texi (Char-Table Type): Add cindex.
+
+       * keymaps.texi (Key Binding Commands): Trivial rephrasing.
+
 2013-02-10  Glenn Morris  <rgm@gnu.org>
 
        * keymaps.texi (Creating Keymaps): Update make-keymap result.