procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix recent bootstrap problems

Browse source 
* 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.
This commit is contained in:
Stefan Monnier 2015-09-24 08:54:39 -04:00
parent 8c909d7512
commit 8f88db1494
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/emacs-lisp/lisp-mode.el
View file

@ -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)

4
lisp/nxml/nxml-mode.el
View file

@ -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)

3
src/syntax.c
View file

@ -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. */