diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2015-09-11 20:00:05 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2015-09-11 20:00:05 -0400 |
| commit | 3928ef2dd5b8febf3b1d9c1bfb22af3698d16bea (patch) | |
| tree | 78c6b4d9eac102e97b6ef2a83edadef0c3152686 /src/syntax.h | |
| parent | 818f06eaa72d8e4f9ba314c1c2855613bf89f396 (diff) | |
Merge syntax-propertize--done and parse-sexp-propertize-done
* lisp/emacs-lisp/syntax.el (syntax-propertize--done): Remove.
(syntax-propertize): Set syntax-propertize--done even if
syntax-propertize-function is nil. Avoid recursive invocations.
(syntax-propertize-chunks): New var.
(internal--syntax-propertize): Use it. Rename from syntax--jit-propertize.
Simplify.
(parse-sexp-propertize-function): Don't set any more.
* src/syntax.c (SETUP_SYNTAX_TABLE): Call parse_sexp_propertize as needed.
(parse_sexp_propertize): Don't assume charpos is not yet propertized.
Call Qinternal__syntax_propertize instead of
Vparse_sexp_propertize_function. Truncate e_property if needed.
(update_syntax_table_forward): Streamline.
(syms_of_syntax): Define Qinternal__syntax_propertize.
(syntax_propertize__done): Rename from parse_sexp_propertize_done.
Diffstat (limited to 'src/syntax.h')
| -rw-r--r-- | src/syntax.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/syntax.h b/src/syntax.h index 9c44181155..34b652ba9c 100644 --- a/src/syntax.h +++ b/src/syntax.h @@ -174,9 +174,10 @@ SYNTAX_TABLE_BYTE_TO_CHAR (ptrdiff_t bytepos) INLINE void 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, gl_state.object); + update_syntax_table_forward (charpos + gl_state.offset, + false, gl_state.object); } /* Make syntax table state (gl_state) good for CHARPOS, assuming it is |