diff options
| author | Stefan Monnier | 2014-09-22 15:20:45 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2014-09-22 15:20:45 -0400 |
| commit | 9949231fb06aa4a2dfa536e9d5125a81424db3a7 (patch) | |
| tree | a2259e8489127b8685097a20a3fd3d7be222d9fe /src/lisp.h | |
| parent | 298dfce8ac018aca6f8f1a38d7199cc28bfaf7fd (diff) | |
| parent | fc5ebc3f497a152132407d57a14cce147d59d29c (diff) | |
| download | emacs-9949231fb06aa4a2dfa536e9d5125a81424db3a7.tar.gz emacs-9949231fb06aa4a2dfa536e9d5125a81424db3a7.zip | |
Merge from emacs-24
Diffstat (limited to 'src/lisp.h')
| -rw-r--r-- | src/lisp.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lisp.h b/src/lisp.h index 2bc9fb13284..3795795c49a 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -3976,8 +3976,7 @@ extern Lisp_Object safe_call2 (Lisp_Object, Lisp_Object, Lisp_Object); | |||
| 3976 | extern void init_eval (void); | 3976 | extern void init_eval (void); |
| 3977 | extern void syms_of_eval (void); | 3977 | extern void syms_of_eval (void); |
| 3978 | extern void unwind_body (Lisp_Object); | 3978 | extern void unwind_body (Lisp_Object); |
| 3979 | extern void record_in_backtrace (Lisp_Object function, | 3979 | extern ptrdiff_t record_in_backtrace (Lisp_Object, Lisp_Object *, ptrdiff_t); |
| 3980 | Lisp_Object *args, ptrdiff_t nargs); | ||
| 3981 | extern void mark_specpdl (void); | 3980 | extern void mark_specpdl (void); |
| 3982 | extern void get_backtrace (Lisp_Object array); | 3981 | extern void get_backtrace (Lisp_Object array); |
| 3983 | Lisp_Object backtrace_top_function (void); | 3982 | Lisp_Object backtrace_top_function (void); |