diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-11-16 13:09:46 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-11-16 13:10:17 -0800 |
| commit | 8ff888a07d0500f1274723086469191aade0a33e (patch) | |
| tree | a21880c49d5eb2ad67084e1d74d81913b30ebf13 /src/syntax.h | |
| parent | 1f07a61ee36d01e85da146f0f32798b8933ea563 (diff) | |
| download | emacs-8ff888a07d0500f1274723086469191aade0a33e.tar.gz | |
Improve fix for regex reentrancy abort
Suggested by Stefan Monnier (Bug#21688).
* src/syntax.c (update_syntax_table_forward):
Remove recently-added PROPERTIZE arg, and assume it is true.
All callers changed.
* src/syntax.h (UPDATE_SYNTAX_TABLE_FORWARD_FAST):
Invoke update_syntax_table directly.
Diffstat (limited to 'src/syntax.h')
| -rw-r--r-- | src/syntax.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/syntax.h b/src/syntax.h index 01c92ae8da0..eb154e088c9 100644 --- a/src/syntax.h +++ b/src/syntax.h @@ -27,7 +27,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ INLINE_HEADER_BEGIN extern void update_syntax_table (ptrdiff_t, EMACS_INT, bool, Lisp_Object); -extern void update_syntax_table_forward (ptrdiff_t, bool, bool, Lisp_Object); +extern void update_syntax_table_forward (ptrdiff_t, bool, Lisp_Object); /* The standard syntax table is stored where it will automatically be used in all new buffers. */ @@ -183,15 +183,14 @@ UPDATE_SYNTAX_TABLE_FORWARD (ptrdiff_t charpos) { /* Performs just-in-time syntax-propertization. */ if (parse_sexp_lookup_properties && charpos >= gl_state.e_property) update_syntax_table_forward (charpos + gl_state.offset, - false, true, gl_state.object); + false, gl_state.object); } INLINE void UPDATE_SYNTAX_TABLE_FORWARD_FAST (ptrdiff_t charpos) { if (parse_sexp_lookup_properties && charpos >= gl_state.e_property) - update_syntax_table_forward (charpos + gl_state.offset, - false, false, gl_state.object); + update_syntax_table (charpos + gl_state.offset, 1, false, gl_state.object); } /* Make syntax table state (gl_state) good for CHARPOS, assuming it is |