Merge remote-tracking branch 'origin/master' into emacs-25

[gnu-emacs] / src / syntax.c

diff --git a/src/syntax.c b/src/syntax.c
index cacdf18c2a2c151740e8d6545582f34ea3a00d8e..1dcb3a5d15d4a086ebb35d217867f9e0e79a62ca 100644 (file)
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -23,12 +23,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <sys/types.h>
 
 #include "lisp.h"
-#include "commands.h"
 #include "character.h"
 #include "buffer.h"
-#include "keymap.h"
 #include "regex.h"
-
 #include "syntax.h"
 #include "intervals.h"
 #include "category.h"
@@ -3672,6 +3669,7 @@ See the info node `(elisp)Syntax Properties' for a description of the
              doc: /* Position up to which syntax-table properties have been set.  */);
   syntax_propertize__done = -1;
   DEFSYM (Qinternal__syntax_propertize, "internal--syntax-propertize");
+  Fmake_variable_buffer_local (intern ("syntax-propertize--done"));
 
   words_include_escapes = 0;
   DEFVAR_BOOL ("words-include-escapes", words_include_escapes,