diff options
| author | Stefan Monnier | 2010-12-12 23:11:49 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2010-12-12 23:11:49 -0500 |
| commit | 7a600d54c026061eee6db4e499802f524e7ebe00 (patch) | |
| tree | 684aa988f06de977a52027ee5e1262c37f7678eb /src/eval.c | |
| parent | f07a954eeb0930029104402e706165bf89853576 (diff) | |
| parent | fdbb4d85ffa2ac30cb7ac0ceea6f12d0c8054d6c (diff) | |
| download | emacs-7a600d54c026061eee6db4e499802f524e7ebe00.tar.gz emacs-7a600d54c026061eee6db4e499802f524e7ebe00.zip | |
Merge from trunk
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c index 63ea95513b3..74dd7e63aa1 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -179,7 +179,7 @@ int handling_signal; | |||
| 179 | Lisp_Object Vmacro_declaration_function; | 179 | Lisp_Object Vmacro_declaration_function; |
| 180 | 180 | ||
| 181 | static Lisp_Object apply_lambda (Lisp_Object fun, Lisp_Object args, | 181 | static Lisp_Object apply_lambda (Lisp_Object fun, Lisp_Object args, |
| 182 | Lisp_Object lexenv) | 182 | Lisp_Object lexenv); |
| 183 | static Lisp_Object funcall_lambda (Lisp_Object, int, Lisp_Object *, | 183 | static Lisp_Object funcall_lambda (Lisp_Object, int, Lisp_Object *, |
| 184 | Lisp_Object); | 184 | Lisp_Object); |
| 185 | static void unwind_to_catch (struct catchtag *, Lisp_Object) NO_RETURN; | 185 | static void unwind_to_catch (struct catchtag *, Lisp_Object) NO_RETURN; |