diff options
| author | Noam Postavsky <npostavs@gmail.com> | 2016-08-05 22:11:00 -0400 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2016-09-23 17:03:43 +0300 |
| commit | 3f539c0013cf0f64b71e58d288ff1e53211fba2d (patch) | |
| tree | 3d9480af0c472b2815d62ea72f7ae3d2573e9048 /src/eval.c | |
| parent | f746a92c3c6d12c09ae07ec24a4a1199aa7a0364 (diff) | |
| download | emacs-3f539c0013cf0f64b71e58d288ff1e53211fba2d.tar.gz | |
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 7fb75680b38fe0805c2ff7e9cca3bec8121ba984)
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 5 |
1 files changed, 5 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); |