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

3 files changed, 12 insertions, 3 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index c262cecb02c..890cf0ef97c 100644
--- 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
diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi
index ab2789b5e6d..9e1d3f9c6ae 100644
--- a/doc/lispref/functions.texi
+++ b/doc/lispref/functions.texi
@@ -1100,8 +1100,9 @@ named function that you create (e.g.@: with @code{defun}), as well as
 any anonymous function that you create using the @code{lambda} macro
 or the @code{function} special form or the @code{#'} syntax
 (@pxref{Anonymous Functions}), is automatically converted into a
-closure.
+@dfn{closure}.
 
+@cindex closure
   A closure is a function that also carries a record of the lexical
 environment that existed when the function was defined.  When it is
 invoked, any lexical variable references within its definition use the
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index affaff46ff9..3b078e7e19f 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -967,11 +967,11 @@ wants the current value of a variable, it looks first in the lexical
 environment; if the variable is not specified in there, it looks in
 the symbol's value cell, where the dynamic value is stored.
 
-@cindex closures
+@cindex closures, example of using
   Lexical bindings have indefinite extent.  Even after a binding
 construct has finished executing, its lexical environment can be
 ``kept around'' in Lisp objects called @dfn{closures}.  A closure is
-created when you create a named or anonymous function with lexical
+created when you define a named or anonymous function with lexical
 binding enabled.  @xref{Closures}, for details.
 
   When a closure is called as a function, any lexical variable