Merge from emacs-24; up to 2014-06-27T16:27:08Z!rgm@gnu.org

[gnu-emacs] / doc / lispref / functions.texi

diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi
index eeb642a04c31ee15a67e26edaf4fa9fef3e24a08..91fdcc63cbe6318ad06cc998881edbf9ba03c730 100644 (file)
--- a/doc/lispref/functions.texi
+++ b/doc/lispref/functions.texi
@@ -1207,10 +1207,10 @@ specify how the two functions are composed, since there are many different
 ways to do it.  The added function is also called an @emph{advice}.
 
 @menu
-* Core Advising Primitives::    Primitives to Manipulate Advices
-* Advising Named Functions::    Advising Named Functions
-* Advice combinators::          Ways to compose advices
-* Porting old advices::         Adapting code using the old defadvice
+* Core Advising Primitives::    Primitives to manipulate advice.
+* Advising Named Functions::    Advising named functions.
+* Advice combinators::          Ways to compose advice.
+* Porting old advices::         Adapting code using the old defadvice.
 @end menu
 
 @node Core Advising Primitives
@@ -1240,7 +1240,8 @@ buffer: if @var{place} is just a symbol, then @var{function} is added to the
 global value of @var{place}.  Whereas if @var{place} is of the form
 @code{(local @var{symbol})}, where @var{symbol} is an expression which returns
 the variable name, then @var{function} will only be added in the
-current buffer.
+current buffer.  Finally, if you want to modify a lexical variable, you will
+have to use @code{(var @var{VARIABLE})}.
 
 Every function added with @code{add-function} can be accompanied by an
 association list of properties @var{props}.  Currently only two of those
@@ -1742,6 +1743,10 @@ Indent calls to this function or macro according to @var{indent-spec}.
 This is typically used for macros, though it works for functions too.
 @xref{Indenting Macros}.
 
+@item (interactive-only @var{value})
+Set the function's @code{interactive-only} property to @var{value}.
+@xref{The interactive-only property}.
+
 @item (obsolete @var{current-name} @var{when})
 Mark the function or macro as obsolete, similar to a call to
 @code{make-obsolete} (@pxref{Obsolete Functions}).  @var{current-name}