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 f8b935eb90b2817ba28b4a4d8bf0fadb06faca6d..fec9467bbb7600ec5ea27c1e0a665febc88911b9 100644 (file)
--- 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 8b0dc9278c574f87cba27b76e3d8f4c8b8f44ebc..0e2fca349a5c85f3ecb345fb666ad5937dff3e39 100644 (file)
--- 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 6b1865f667fdaa5d73b3df009cb2130ce6dc49f7..cacdf18c2a2c151740e8d6545582f34ea3a00d8e 100644 (file)
--- 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.  */