From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 24 Sep 2015 12:54:39 +0000 (-0400)
Subject: Fix recent bootstrap problems
X-Git-Tag: emacs-25.0.90~1224^2~26
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8f88db14946f46a95603dfaa2a425d64b01fbb53;p=emacs.git

Fix recent bootstrap problems

* src/syntax.c (parse_sexp_propertize): Fix last fix.
* lisp/nxml/nxml-mode.el (nxml-comment-quote-nested): Fix paren typo.
* lisp/emacs-lisp/lisp-mode.el: Require cl-lib for cl-progv.
---

diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index f8b935eb90b..fec9467bbb7 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -28,6 +28,8 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl-lib))
+
 (defvar font-lock-comment-face)
 (defvar font-lock-doc-face)
 (defvar font-lock-keywords-case-fold-search)
diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el
index 8b0dc9278c5..0e2fca349a5 100644
--- a/lisp/nxml/nxml-mode.el
+++ b/lisp/nxml/nxml-mode.el
@@ -1351,9 +1351,9 @@ of the inserted start-tag or nil if none was inserted."
 			    start-tag-indent)))))
     inserted-start-tag-pos))
 
-(defun nxml-comment-quote-nested (cs ce unp)
+(defun nxml-comment-quote-nested (_cs _ce unp)
   "Quote nested comments in buffer.
-See `comment-quote-nested-function' for more information.")
+See `comment-quote-nested-function' for more information."
   (goto-char (point-min))
   (save-match-data
     (while (re-search-forward "-[\\]*-" nil t)
diff --git a/src/syntax.c b/src/syntax.c
index 6b1865f667f..cacdf18c2a2 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -499,7 +499,8 @@ parse_sexp_propertize (ptrdiff_t charpos)
       gl_state.e_property = syntax_propertize__done;
       gl_state.e_property_truncated = true;
     }
-  else if (gl_state.e_property_truncated)
+  else if (gl_state.e_property_truncated
+	   && gl_state.e_property < syntax_propertize__done)
     { /* When moving backward, e_property might be set without resetting
 	 e_property_truncated, so the e_property_truncated flag may
 	 occasionally be left raised spuriously.  This should be rare.  */