aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorStefan Monnier2015-09-24 08:54:39 -0400
committerStefan Monnier2015-09-24 08:54:39 -0400
commit8f88db14946f46a95603dfaa2a425d64b01fbb53 (patch)
tree88d3f5ad8b6dd0fed1eae4ade62fd60e2e42f58d /lisp
parent8c909d75128b5bf92b090d34adbe07ed882ecd74 (diff)
downloademacs-8f88db14946f46a95603dfaa2a425d64b01fbb53.tar.gz
emacs-8f88db14946f46a95603dfaa2a425d64b01fbb53.zip
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.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/emacs-lisp/lisp-mode.el2
-rw-r--r--lisp/nxml/nxml-mode.el4
2 files changed, 4 insertions, 2 deletions
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 @@
28 28
29;;; Code: 29;;; Code:
30 30
31(eval-when-compile (require 'cl-lib))
32
31(defvar font-lock-comment-face) 33(defvar font-lock-comment-face)
32(defvar font-lock-doc-face) 34(defvar font-lock-doc-face)
33(defvar font-lock-keywords-case-fold-search) 35(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."
1351 start-tag-indent))))) 1351 start-tag-indent)))))
1352 inserted-start-tag-pos)) 1352 inserted-start-tag-pos))
1353 1353
1354(defun nxml-comment-quote-nested (cs ce unp) 1354(defun nxml-comment-quote-nested (_cs _ce unp)
1355 "Quote nested comments in buffer. 1355 "Quote nested comments in buffer.
1356See `comment-quote-nested-function' for more information.") 1356See `comment-quote-nested-function' for more information."
1357 (goto-char (point-min)) 1357 (goto-char (point-min))
1358 (save-match-data 1358 (save-match-data
1359 (while (re-search-forward "-[\\]*-" nil t) 1359 (while (re-search-forward "-[\\]*-" nil t)