diff options
| -rw-r--r-- | src/eval.c | 5 | ||||
| -rw-r--r-- | src/search.c | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/eval.c b/src/eval.c index fe6460d53bb..13a41a2ae20 100644 --- a/src/eval.c +++ b/src/eval.c @@ -299,6 +299,11 @@ call_debugger (Lisp_Object arg) specbind (Qinhibit_redisplay, Qnil); specbind (Qinhibit_debugger, Qt); + /* If we are debugging an error while `inhibit-changing-match-data' + is bound to non-nil (e.g., within a call to `string-match-p'), + then make sure debugger code can still use match data. */ + specbind (Qinhibit_changing_match_data, Qnil); + #if 0 /* Binding this prevents execution of Lisp code during redisplay, which necessarily leads to display problems. */ specbind (Qinhibit_eval_during_redisplay, Qt); diff --git a/src/search.c b/src/search.c index b70f02097b7..dc7e2d88603 100644 --- a/src/search.c +++ b/src/search.c @@ -3396,6 +3396,7 @@ or other such regexp constructs are not replaced with this. A value of nil (which is the normal value) means treat spaces literally. */); Vsearch_spaces_regexp = Qnil; + DEFSYM (Qinhibit_changing_match_data, "inhibit-changing-match-data"); DEFVAR_LISP ("inhibit-changing-match-data", Vinhibit_changing_match_data, doc: /* Internal use only. If non-nil, the primitive searching and matching functions |