diff options
| author | Joakim Verona | 2015-02-08 21:55:28 +0100 |
|---|---|---|
| committer | Joakim Verona | 2015-02-08 21:55:28 +0100 |
| commit | 5e1d5ef39ca0d2fbff26d659f2ec6ce863b14529 (patch) | |
| tree | 860e0d53399626aee6249ebb5f972879f403b228 /src/data.c | |
| parent | 148262ce3db990ed16989341345e232570b3a338 (diff) | |
| parent | 7d631aa0ffab875e4979727f632703ad5b4100a2 (diff) | |
| download | emacs-xwidget.tar.gz emacs-xwidget.zip | |
merge masterxwidget
Diffstat (limited to 'src/data.c')
| -rw-r--r-- | src/data.c | 5 |
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. |
| 2126 | If OBJECT is not a symbol, just return it. Otherwise, follow all | 2126 | If OBJECT is not a symbol, just return it. Otherwise, follow all |
| 2127 | function indirections to find the final function binding and return it. | 2127 | function indirections to find the final function binding and return it. |
| 2128 | If the final symbol in the chain is unbound, signal a void-function error. | ||
| 2129 | Optional arg NOERROR non-nil means to return nil instead of signaling. | ||
| 2130 | Signal a cyclic-function-indirection error if there is a loop in the | 2128 | Signal a cyclic-function-indirection error if there is a loop in the |
| 2131 | function chain of symbols. */) | 2129 | function 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 | ||