Merge from emacs-24; up to 2012-05-02T07:12:52Z!rgm@gnu.org.

[gnu-emacs] / doc / lispref / ChangeLog

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index c262cecb02cb66a7cc3bed7f169e34de7a3a2024..890cf0ef97ce09fa094aa77f208a0b6dcb02779a 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,11 @@
+2012-08-06  Eli Zaretskii  <eliz@gnu.org>
+
+       * functions.texi (Closures): Put the main index entry for
+       "closures" here.  (Bug#12138)
+
+       * variables.texi (Lexical Binding): Disambiguate the index entry
+       for "closures".
+
 2012-08-05  Chong Yidong  <cyd@gnu.org>
 
        * display.texi (Defining Faces): Move documentation of