aboutsummaryrefslogtreecommitdiffstats
path: root/src/data.c
diff options
context:
space:
mode:
authorStefan Monnier2015-02-08 08:51:10 -0500
committerStefan Monnier2015-02-08 08:51:10 -0500
commit60f8214e97042bb1c4e7beb9da8df76cd4c124f7 (patch)
tree9b562436a3da048e7423ac51abf1e12b1875781c /src/data.c
parentdcec731abfc110f719f0890fd0769e099393af7d (diff)
downloademacs-60f8214e97042bb1c4e7beb9da8df76cd4c124f7.tar.gz
emacs-60f8214e97042bb1c4e7beb9da8df76cd4c124f7.zip
* src/data.c (Findirect_function): Don't signal an error
* src/data.c (Findirect_function): Like `symbol-function', don't signal an error for void functions any more. * lisp/subr.el (indirect-function): Change advertised calling convention.
Diffstat (limited to 'src/data.c')
-rw-r--r--src/data.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/data.c b/src/data.c
index d06b9916b3a..47706584f5e 100644
--- a/src/data.c
+++ b/src/data.c
@@ -2125,8 +2125,6 @@ DEFUN ("indirect-function", Findirect_function, Sindirect_function, 1, 2, 0,
2125 doc: /* Return the function at the end of OBJECT's function chain. 2125 doc: /* Return the function at the end of OBJECT's function chain.
2126If OBJECT is not a symbol, just return it. Otherwise, follow all 2126If OBJECT is not a symbol, just return it. Otherwise, follow all
2127function indirections to find the final function binding and return it. 2127function indirections to find the final function binding and return it.
2128If the final symbol in the chain is unbound, signal a void-function error.
2129Optional arg NOERROR non-nil means to return nil instead of signaling.
2130Signal a cyclic-function-indirection error if there is a loop in the 2128Signal a cyclic-function-indirection error if there is a loop in the
2131function chain of symbols. */) 2129function chain of symbols. */)
2132 (register Lisp_Object object, Lisp_Object noerror) 2130 (register Lisp_Object object, Lisp_Object noerror)
@@ -2141,9 +2139,6 @@ function chain of symbols. */)
2141 if (!NILP (result)) 2139 if (!NILP (result))
2142 return result; 2140 return result;
2143 2141
2144 if (NILP (noerror))
2145 xsignal1 (Qvoid_function, object);
2146
2147 return Qnil; 2142 return Qnil;
2148} 2143}
2149 2144