Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-14

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 58-65)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 22-28)

   - Update from CVS
   - Merge from emacs--devo--0
   - Update from CVS: lisp/gnus.el: Remove bogus comment.

3 files changed, 18 insertions, 6 deletions

diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index c1cc71f0d8b..b396e8b3ee7 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,12 @@
+2006-02-10  Kim F. Storm  <storm@cua.dk>
+
+        * eval.texi (Function Indirection): Add NOERROR to indirect-function.
+
+2006-02-08  Juanma Barranquero  <lekktu@gmail.com>
+
+        * modes.texi (%-Constructs): Remove obsolete info about
+        `global-mode-string'.
+
 2006-02-07  Richard M. Stallman  <rms@gnu.org>
 
         * commands.texi (Prefix Command Arguments): Minor cleanup.
diff --git a/lispref/eval.texi b/lispref/eval.texi
index d898e08850b..803f3d4a70d 100644
--- a/lispref/eval.texi
+++ b/lispref/eval.texi
@@ -314,16 +314,20 @@ symbol function indirection when calling @code{erste}.
 perform symbol function indirection explicitly.
 
 @c Emacs 19 feature
-@defun indirect-function function
+@defun indirect-function function &optional noerror
 @anchor{Definition of indirect-function}
 This function returns the meaning of @var{function} as a function.  If
 @var{function} is a symbol, then it finds @var{function}'s function
 definition and starts over with that value.  If @var{function} is not a
 symbol, then it returns @var{function} itself.
 
-This function signals a @code{void-function} error if the final
-symbol is unbound and a @code{cyclic-function-indirection} error if
-there is a loop in the chain of symbols.
+This function signals a @code{void-function} error if the final symbol
+is unbound and optional argument @var{noerror} is @code{nil} or
+omitted.  Otherwise, if @var{noerror} is non-@code{nil}, it returns
+@code{nil} if the final symbol is unbound.
+
+It signals a @code{cyclic-function-indirection} error if there is a
+loop in the chain of symbols.
 
 Here is how you could define @code{indirect-function} in Lisp:
 
diff --git a/lispref/modes.texi b/lispref/modes.texi
index 0c7d249fb87..b9eb33dcb88 100644
--- a/lispref/modes.texi
+++ b/lispref/modes.texi
@@ -2012,8 +2012,7 @@ obsolete, since you can get the same results with the variables
 The value of @code{mode-name}.
 
 @item %M
-The value of @code{global-mode-string}.  Currently, only
-@code{display-time} modifies the value of @code{global-mode-string}.
+The value of @code{global-mode-string}.
 @end table
 
 @node Properties in Mode