[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
feature/soc-bytecode-in-traceback-reduced bed4004 2/2: Clean up before p
From: |
Rocky Bernstein |
Subject: |
feature/soc-bytecode-in-traceback-reduced bed4004 2/2: Clean up before patch submission |
Date: |
Tue, 28 Jul 2020 00:04:21 -0400 (EDT) |
branch: feature/soc-bytecode-in-traceback-reduced
commit bed4004fd334e101a5fb4ee8a3bbf23f4679ba87
Author: Zach Shaftel <zshaftel@gmail.com>
Commit: Zach Shaftel <zshaftel@gmail.com>
Clean up before patch submission
* src/lisp.h (struct handler): Remove unused 'bytecode_offset' field,
which was added at some point while prototyping.
* src/bytecode.c (UPDATE_OFFSET): Subtract 1, so the offset is accurate.
---
src/bytecode.c | 2 +-
src/eval.c | 2 ++
src/lisp.h | 3 ---
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/bytecode.c b/src/bytecode.c
index 4ea3cbf..c6766a3 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -313,7 +313,7 @@ enum byte_code_op
/* Update the thread's bytecode offset, just before NEXT. */
-#define UPDATE_OFFSET (backtrace_byte_offset = pc - bytestr_data)
+#define UPDATE_OFFSET (backtrace_byte_offset = pc - bytestr_data - 1)
DEFUN ("byte-code", Fbyte_code, Sbyte_code, 3, 3, 0,
doc: /* Function used internally in byte-compiled code.
diff --git a/src/eval.c b/src/eval.c
index b9640f6..e4451aa 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -342,7 +342,9 @@ call_debugger (Lisp_Object arg)
redisplay, which necessarily leads to display problems. */
specbind (Qinhibit_eval_during_redisplay, Qt);
#endif
+
val = apply1 (Vdebugger, arg);
+
/* Interrupting redisplay and resuming it later is not safe under
all circumstances. So, when the debugger returns, abort the
interrupted redisplay by going back to the top-level. */
diff --git a/src/lisp.h b/src/lisp.h
index f413d7a..e92300f 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3281,9 +3281,6 @@ struct handler
enum nonlocal_exit nonlocal_exit;
Lisp_Object val;
- /* The bytecode offset where the error occurred. */
- int bytecode_offset;
-
struct handler *next;
struct handler *nextfree;