From: Glenn Morris <rgm@gnu.org>
Date: Wed, 31 Oct 2012 21:04:28 +0000 (-0400)
Subject: * doc/misc/cl.texi (Modify Macros, Function Bindings): Add some xrefs.
X-Git-Tag: emacs-24.2.90~192
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=87b0d8b1d1ca858c76afa23e4a936bdd9fd8c2e1;p=emacs.git

* doc/misc/cl.texi (Modify Macros, Function Bindings): Add some xrefs.
---

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index b77147fb0d7..29d8792ce6b 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -7,6 +7,7 @@
 	(Obsolete Lexical Binding): Rename section from "Lexical Bindings".
 	(Obsolete Macros): Rename section from "Obsolete Lexical Macros".
 	Reword, and add details of flet and labels.
+	(Modify Macros, Function Bindings): Add some xrefs.
 
 2012-10-30  Glenn Morris  <rgm@gnu.org>
 
diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi
index 10735420534..d0ca78e55ee 100644
--- a/doc/misc/cl.texi
+++ b/doc/misc/cl.texi
@@ -1193,6 +1193,9 @@ The only exceptions are plain variables and calls to
 bound on entry, it is simply made unbound by @code{makunbound} or
 @code{fmakunbound} on exit.
 @end ignore
+
+Note that the @file{cl.el} version of this macro behaves slightly
+differently.  @xref{Obsolete Macros}.
 @end defmac
 
 @defmac cl-letf* (bindings@dots{}) forms@dots{}
@@ -1283,11 +1286,13 @@ accordingly for the duration of the body of the @code{cl-flet}; then
 the old function definition, or lack thereof, is restored.
 
 You can use @code{cl-flet} to disable or modify the behavior of a
-function in a temporary fashion.  This will even work on Emacs
-primitives, although note that some calls to primitive functions
-internal to Emacs are made without going through the symbol's
-function cell, and so will not be affected by @code{cl-flet}.  For
-example,
+function in a temporary fashion.  (Compare this with the idea
+of advising functions.
+@xref{Advising Functions,,,elisp,GNU Emacs Lisp Reference Manual}.)
+This will even work on Emacs primitives, although note that some calls
+to primitive functions internal to Emacs are made without going
+through the symbol's function cell, and so will not be affected by
+@code{cl-flet}.  For example,
 
 @example
 (cl-flet ((message (&rest args) (push args saved-msgs)))
@@ -1307,6 +1312,9 @@ Functions defined by @code{cl-flet} may use the full Common Lisp
 argument notation supported by @code{cl-defun}; also, the function
 body is enclosed in an implicit block as if by @code{cl-defun}.
 @xref{Program Structure}.
+
+Note that the @file{cl.el} version of this macro behaves slightly
+differently.  @xref{Obsolete Macros}.
 @end defmac
 
 @defmac cl-labels (bindings@dots{}) forms@dots{}
@@ -1327,6 +1335,9 @@ local recursive functions, or mutually-recursive sets of functions.
 A ``reference'' to a function name is either a call to that
 function, or a use of its name quoted by @code{quote} or
 @code{function} to be passed on to, say, @code{mapcar}.
+
+Note that the @file{cl.el} version of this macro behaves slightly
+differently.  @xref{Obsolete Macros}.
 @end defmac
 
 @node Macro Bindings