aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2008-07-05 04:26:11 +0000
committerStefan Monnier2008-07-05 04:26:11 +0000
commit41b90495794f94679f36e7b89f4ce32f02449aca (patch)
treefe2b0967cf9cacc4c51cc7e4ba6d83a3717f576f
parent26d41f17e5a6c16bb570ae07e045c8d8ee635b4b (diff)
downloademacs-41b90495794f94679f36e7b89f4ce32f02449aca.tar.gz
emacs-41b90495794f94679f36e7b89f4ce32f02449aca.zip
(sgml-font-lock-syntactic-keywords):
Use syntax-ppss on a position *before* the char we want to change.
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/textmodes/sgml-mode.el6
2 files changed, 11 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c4b6e2a8414..e5e5c7e629c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,13 @@
12008-07-05 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * textmodes/sgml-mode.el (sgml-font-lock-syntactic-keywords):
4 Use syntax-ppss on a position *before* the char we want to change.
5
12008-07-04 Dan Nicolaescu <dann@ics.uci.edu> 62008-07-04 Dan Nicolaescu <dann@ics.uci.edu>
2 7
3 * vc-dir.el (vc-dir-query-replace-regexp): New function. 8 * vc-dir.el (vc-dir-query-replace-regexp): New function.
4 (vc-dir-tool-bar-map, vc-dir-menu-map): Bind it. 9 (vc-dir-tool-bar-map, vc-dir-menu-map): Bind it.
5 (vc-dir-mode-map): Likewise 10 (vc-dir-mode-map): Likewise.
6 11
72008-07-03 Juanma Barranquero <lekktu@gmail.com> 122008-07-03 Juanma Barranquero <lekktu@gmail.com>
8 13
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index d28f55bd70a..67ed335a9c0 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -292,7 +292,11 @@ Any terminating `>' or `/' is not matched.")
292 '(("\\(<\\)!--" (1 "< b")) 292 '(("\\(<\\)!--" (1 "< b"))
293 ("--[ \t\n]*\\(>\\)" (1 "> b")) 293 ("--[ \t\n]*\\(>\\)" (1 "> b"))
294 ;; Double quotes outside of tags should not introduce strings. 294 ;; Double quotes outside of tags should not introduce strings.
295 ("\\\"" (0 (if (zerop (car (syntax-ppss))) ".")))) 295 ;; Be careful to call `syntax-ppss' on a position before the one we're
296 ;; going to change, so as not to need to flush the data we just computed.
297 ("\"" (0 (if (prog1 (zerop (car (syntax-ppss (match-beginning 0))))
298 (goto-char (match-end 0)))
299 "."))))
296 "Syntactic keywords for `sgml-mode'.") 300 "Syntactic keywords for `sgml-mode'.")
297 301
298;; internal 302;; internal