diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2015-09-24 08:54:39 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2015-09-24 08:54:39 -0400 |
| commit | 8f88db14946f46a95603dfaa2a425d64b01fbb53 (patch) | |
| tree | 88d3f5ad8b6dd0fed1eae4ade62fd60e2e42f58d | |
| parent | 8c909d75128b5bf92b090d34adbe07ed882ecd74 (diff) | |
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.
| -rw-r--r-- | lisp/emacs-lisp/lisp-mode.el | 2 | ||||
| -rw-r--r-- | lisp/nxml/nxml-mode.el | 4 | ||||
| -rw-r--r-- | src/syntax.c | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index f8b935eb90..fec9467bbb 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 8b0dc9278c..0e2fca349a 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 6b1865f667..cacdf18c2a 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. */ |