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.

1 files changed, 10 insertions, 7 deletions

diff --git a/src/data.c b/src/data.c
index fbfbb141d48..a4d865f681e 100644
--- a/src/data.c
+++ b/src/data.c
@@ -1927,23 +1927,26 @@ indirect_function (object)
   return hare;
 }
 
-DEFUN ("indirect-function", Findirect_function, Sindirect_function, 1, 1, 0,
+DEFUN ("indirect-function", Findirect_function, Sindirect_function, 1, 2, 0,
        doc: /* Return the function at the end of OBJECT's function chain.
-If OBJECT is a symbol, follow all function indirections and return the final
-function binding.
-If OBJECT is not a symbol, just return it.
-Signal a void-function error if the final symbol is unbound.
+If OBJECT is not a symbol, just return it.  Otherwise, follow all
+function indirections to find the final function binding and return it.
+If the final symbol in the chain is unbound, signal a void-function error.
+Optional arg NOERROR non-nil means to return nil instead of signalling.
 Signal a cyclic-function-indirection error if there is a loop in the
 function chain of symbols.  */)
-     (object)
+     (object, noerror)
      register Lisp_Object object;
+     Lisp_Object noerror;
 {
   Lisp_Object result;
 
   result = indirect_function (object);
 
   if (EQ (result, Qunbound))
-    return Fsignal (Qvoid_function, Fcons (object, Qnil));
+    return (NILP (noerror)
+            ? Fsignal (Qvoid_function, Fcons (object, Qnil))
+            : Qnil);
   return result;
 }