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.

diff --git a/src/bytecode.c b/src/bytecode.c
index 4ea3cbfb12be1a667bcd74d5cf4138be5d4273f9..c6766a38cf25d4380e29621836a2dec6e82a1f83 100644 (file)
--- 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 b9640f6ab7acdb27388ea5056969fecbbc9ec00e..e4451aa96c4856019f63cbaa90a9590bb9df61b9 100644 (file)
--- 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 f413d7a45ec64b9f3997e56343c43075c9810374..e92300f4f7740450645bb4b4d4a2402ab4724f37 100644 (file)
--- 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;