diff options
| author | Michael R. Mauger | 2017-07-24 22:15:04 -0400 |
|---|---|---|
| committer | Michael R. Mauger | 2017-07-24 22:15:04 -0400 |
| commit | df1a71272e5cdd10b511e2ffd702ca50ddd8a773 (patch) | |
| tree | 9b9ac725394ee80891e2bff57b6407d0e491e71a /src/eval.c | |
| parent | eb27fc4d49e8c914cd0e6a8a2d02159601542141 (diff) | |
| parent | 32daa3cb54523006c88717cbeac87964cd687a1b (diff) | |
| download | emacs-df1a71272e5cdd10b511e2ffd702ca50ddd8a773.tar.gz emacs-df1a71272e5cdd10b511e2ffd702ca50ddd8a773.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/eval.c b/src/eval.c index 8f293c9d300..e5900382dee 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -213,13 +213,6 @@ backtrace_next (union specbinding *pdl) | |||
| 213 | return pdl; | 213 | return pdl; |
| 214 | } | 214 | } |
| 215 | 215 | ||
| 216 | /* Return a pointer to somewhere near the top of the C stack. */ | ||
| 217 | void * | ||
| 218 | near_C_stack_top (void) | ||
| 219 | { | ||
| 220 | return backtrace_args (backtrace_top ()); | ||
| 221 | } | ||
| 222 | |||
| 223 | void | 216 | void |
| 224 | init_eval_once (void) | 217 | init_eval_once (void) |
| 225 | { | 218 | { |
| @@ -2090,7 +2083,7 @@ record_in_backtrace (Lisp_Object function, Lisp_Object *args, ptrdiff_t nargs) | |||
| 2090 | specpdl_ptr->bt.kind = SPECPDL_BACKTRACE; | 2083 | specpdl_ptr->bt.kind = SPECPDL_BACKTRACE; |
| 2091 | specpdl_ptr->bt.debug_on_exit = false; | 2084 | specpdl_ptr->bt.debug_on_exit = false; |
| 2092 | specpdl_ptr->bt.function = function; | 2085 | specpdl_ptr->bt.function = function; |
| 2093 | specpdl_ptr->bt.args = args; | 2086 | current_thread->stack_top = specpdl_ptr->bt.args = args; |
| 2094 | specpdl_ptr->bt.nargs = nargs; | 2087 | specpdl_ptr->bt.nargs = nargs; |
| 2095 | grow_specpdl (); | 2088 | grow_specpdl (); |
| 2096 | 2089 | ||