mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-16 17:24:23 +00:00
Fix debugging of string-match-p errors
* src/eval.c (call_debugger): Bind inhibit-changing-match-data to nil so
that debugger code that needs to do regexp match won't break
(Bug #23949, Bug #24166, Bug#16294).
This was backported from master
(cherry picked from commit 7fb75680b3)
This commit is contained in:
parent
f746a92c3c
commit
3f539c0013
2 changed files with 6 additions and 0 deletions
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue