upstream

1 files changed, 29 insertions, 0 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index bd7b27bbe60..a172f82d2e5 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,9 +1,38 @@
+2012-02-07  Glenn Morris  <rgm@gnu.org>
+
+        * modes.texi (Defining Minor Modes):
+        Expand on args of defined minor modes.
+
+2012-02-07  Chong Yidong  <cyd@gnu.org>
+
+        * variables.texi (Creating Buffer-Local): Minor clarification
+        to buffer-local-variables doc (Bug#10715).
+
+2012-02-07  Glenn Morris  <rgm@gnu.org>
+
+        * display.texi (ImageMagick Images): General update.
+        Move most details of imagemagick-render-type to the variable's doc.
+
+2012-02-06  Glenn Morris  <rgm@gnu.org>
+
+        * keymaps.texi (Tool Bar): Mention separators.
+        (Inheritance and Keymaps):
+        Mention make-composed-keymap and multiple inheritance.
+
+        * modes.texi (Running Hooks): Mention run-hook-wrapped.
+
+        * control.texi (Handling Errors):
+        Mention condition-case-no-debug and with-demoted-errors.
+
 2012-02-05  Chong Yidong  <cyd@gnu.org>
 
         * customize.texi (Common Keywords): Minor clarifications.
         Document custom-unlispify-remove-prefixes.
         (Variable Definitions): Backquotes in defcustom seem to work fine
         now.  Various other copyedits.
+        (Simple Types): Copyedits.  Document color selector.
+        (Composite Types): Copyedits.
+        (Splicing into Lists): Clarifications.
 
         * eval.texi (Backquote): Move from macros.texi.