1 files changed, 67 insertions, 11 deletions

diff --git a/src/syntax.c b/src/syntax.c
index dc82210e79d..776ff984369 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -247,7 +247,7 @@ SETUP_SYNTAX_TABLE (ptrdiff_t from, ptrdiff_t count)
   gl_state.offset = 0;
   if (parse_sexp_lookup_properties)
     if (count > 0 || from > BEGV)
-      update_syntax_table (count > 0 ? from : from - 1, count, 1, Qnil);
+      update_syntax_table (count > 0 ? from : from - 1, count, true, Qnil);
 }
 
 /* Same as above, but in OBJECT.  If OBJECT is nil, use current buffer.
@@ -313,7 +313,7 @@ update_syntax_table (ptrdiff_t charpos, EMACS_INT count, bool init,
 {
   Lisp_Object tmp_table;
   int cnt = 0;
-  bool invalidate = 1;
+  bool invalidate = true;
   INTERVAL i;
 
   if (init)
@@ -323,7 +323,7 @@ update_syntax_table (ptrdiff_t charpos, EMACS_INT count, bool init,
       gl_state.stop = gl_state.e_property;
       i = interval_of (charpos, object);
       gl_state.backward_i = gl_state.forward_i = i;
-      invalidate = 0;
+      invalidate = false;
       if (!i)
         return;
       /* interval_of updates only ->position of the return value, so
@@ -359,7 +359,7 @@ update_syntax_table (ptrdiff_t charpos, EMACS_INT count, bool init,
       i = update_interval (i, charpos);
       if (INTERVAL_LAST_POS (i) != gl_state.b_property)
         {
-          invalidate = 0;
+          invalidate = false;
           gl_state.forward_i = i;
           gl_state.e_property = INTERVAL_LAST_POS (i) - gl_state.offset;
         }
@@ -372,7 +372,7 @@ update_syntax_table (ptrdiff_t charpos, EMACS_INT count, bool init,
       i = update_interval (i, charpos);
       if (i->position != gl_state.e_property)
         {
-          invalidate = 0;
+          invalidate = false;
           gl_state.backward_i = i;
           gl_state.b_property = i->position - gl_state.offset;
         }
@@ -460,14 +460,56 @@ update_syntax_table (ptrdiff_t charpos, EMACS_INT count, bool init,
     }
   eassert (i == NULL); /* This property goes to the end.  */
   if (count > 0)
-    gl_state.e_property = gl_state.stop;
+    {
+      gl_state.e_property = gl_state.stop;
+      gl_state.forward_i = i;
+    }
   else
     gl_state.b_property = gl_state.start;
 }
+
+static void
+parse_sexp_propertize (ptrdiff_t charpos)
+{
+  EMACS_INT modiffs = CHARS_MODIFF;
+  safe_call1 (Vparse_sexp_propertize_function,
+              make_number (1 + charpos));
+  if (modiffs != CHARS_MODIFF)
+    error ("parse-sexp-propertize-function modified the buffer!");
+  if (parse_sexp_propertize_done <= charpos)
+    error ("parse-sexp-propertize-function did not move"
+           " parse-sexp-propertize-done");
+  SETUP_SYNTAX_TABLE (charpos, 1);
+  if (gl_state.e_property > parse_sexp_propertize_done)
+    {
+      gl_state.e_property = parse_sexp_propertize_done;
+      gl_state.e_property_truncated = true;
+    }
+}
+
+void
+update_syntax_table_forward (ptrdiff_t charpos, bool init,
+                     Lisp_Object object)
+{
+  if (!(gl_state.e_property_truncated))
+    update_syntax_table (charpos, 1, init, object);
+  if ((gl_state.e_property > parse_sexp_propertize_done
+       || gl_state.e_property_truncated)
+      && NILP (object))
+    {
+      if (parse_sexp_propertize_done > charpos)
+        {
+          gl_state.e_property = parse_sexp_propertize_done;
+          gl_state.e_property_truncated = true;
+        }
+      else
+        parse_sexp_propertize (charpos);
+    }
+}
 
 /* Returns true if char at CHARPOS is quoted.
    Global syntax-table data should be set up already to be good at CHARPOS
-   or after.  On return global syntax data is good for lookup at CHARPOS. */
+   or after.  On return global syntax data is good for lookup at CHARPOS.  */
 
 static bool
 char_quoted (ptrdiff_t charpos, ptrdiff_t bytepos)
@@ -628,7 +670,7 @@ back_comment (ptrdiff_t from, ptrdiff_t from_byte, ptrdiff_t stop,
      OFROM[I] is position of the earliest comment-starter seen
      which is I+2X quotes from the comment-end.
      PARITY is current parity of quotes from the comment end.  */
-  int string_style = -1;        /* Presumed outside of any string. */
+  int string_style = -1;        /* Presumed outside of any string.  */
   bool string_lossage = 0;
   /* Not a real lossage: indicates that we have passed a matching comment
      starter plus a non-matching comment-ender, meaning that any matching
@@ -645,7 +687,7 @@ back_comment (ptrdiff_t from, ptrdiff_t from_byte, ptrdiff_t stop,
   ptrdiff_t defun_start = 0;
   ptrdiff_t defun_start_byte = 0;
   enum syntaxcode code;
-  ptrdiff_t nesting = 1;                /* current comment nesting */
+  ptrdiff_t nesting = 1;                /* Current comment nesting.  */
   int c;
   int syntax = 0;
 
@@ -876,7 +918,7 @@ back_comment (ptrdiff_t from, ptrdiff_t from_byte, ptrdiff_t stop,
                    is nested, so we need to try again from within the
                    surrounding comment.  Example: { a (* " *)  */
                 {
-                  /* FIXME: We should advance by one or two chars. */
+                  /* FIXME: We should advance by one or two chars.  */
                   defun_start = state.comstr_start + 2;
                   defun_start_byte = CHAR_TO_BYTE (defun_start);
                 }
@@ -3588,7 +3630,7 @@ syms_of_syntax (void)
   staticpro (&gl_state.current_syntax_table);
   staticpro (&gl_state.old_prop);
 
-  /* Defined in regex.c */
+  /* Defined in regex.c.  */
   staticpro (&re_match_object);
 
   DEFSYM (Qscan_error, "scan-error");
@@ -3606,6 +3648,20 @@ Otherwise, that text property is simply ignored.
 See the info node `(elisp)Syntax Properties' for a description of the
 `syntax-table' property.  */);
 
+  DEFVAR_INT ("parse-sexp-propertize-done", parse_sexp_propertize_done,
+              doc: /* Position up to which syntax-table properties have been set.  */);
+  parse_sexp_propertize_done = -1;
+
+  DEFVAR_LISP ("parse-sexp-propertize-function",
+               Vparse_sexp_propertize_function,
+          doc: /* Function to set the `syntax-table' text property.
+Called with one argument, the position at which the property is needed.
+After running it, `parse-sexp-propertize-done' should be strictly greater
+than the argument passed.  */);
+  /* Note: Qnil is a temporary (and invalid) value; it will be properly set in
+     syntax.el.  */
+  Vparse_sexp_propertize_function = Qnil;
+
   words_include_escapes = 0;
   DEFVAR_BOOL ("words-include-escapes", words_include_escapes,
                doc: /* Non-nil means `forward-word', etc., should treat escape chars part of words.  */);