From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 9 Sep 2015 20:22:29 +0000 (-0400)
Subject: * src/syntax.c (SETUP_SYNTAX_TABLE): Move truncation...
X-Git-Tag: emacs-25.0.90~1224^2~173
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0b78dd60277129af9f520e4d5dc8c7e528c63eee;p=emacs.git

* src/syntax.c (SETUP_SYNTAX_TABLE): Move truncation...

(parse_sexp_propertize): ...from here.
---

diff --git a/src/syntax.c b/src/syntax.c
index 776ff984369..fcd6d017d33 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -246,8 +246,15 @@ SETUP_SYNTAX_TABLE (ptrdiff_t from, ptrdiff_t count)
   gl_state.object = Qnil;
   gl_state.offset = 0;
   if (parse_sexp_lookup_properties)
-    if (count > 0 || from > BEGV)
-      update_syntax_table (count > 0 ? from : from - 1, count, true, Qnil);
+    {
+      if (count > 0 || from > BEGV)
+	update_syntax_table (count > 0 ? from : from - 1, count, true, Qnil);
+      if (gl_state.e_property > parse_sexp_propertize_done)
+	{
+	  gl_state.e_property = parse_sexp_propertize_done;
+	  gl_state.e_property_truncated = true;
+	}
+    }
 }
 
 /* Same as above, but in OBJECT.  If OBJECT is nil, use current buffer.
@@ -480,11 +487,6 @@ parse_sexp_propertize (ptrdiff_t 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