aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schwab2003-01-11 22:47:33 +0000
committerAndreas Schwab2003-01-11 22:47:33 +0000
commit13b454db2d7a6ee6fd4a53d1b7fb155e87bca1ad (patch)
tree34a083cefb0a81bdb0b31acf221c3ea9cb05a666
parent50ac5b3cee92bb70df156a7e1e7ffa27fc2a0230 (diff)
downloademacs-13b454db2d7a6ee6fd4a53d1b7fb155e87bca1ad.tar.gz
emacs-13b454db2d7a6ee6fd4a53d1b7fb155e87bca1ad.zip
(sgml-font-lock-keywords-2): Add flag to merge with existing fontification.
-rw-r--r--lisp/textmodes/sgml-mode.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index be85f4574b0..75d56392fab 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -1,6 +1,6 @@
1;;; sgml-mode.el --- SGML- and HTML-editing modes 1;;; sgml-mode.el --- SGML- and HTML-editing modes
2 2
3;; Copyright (C) 1992,95,96,98,2001,2002 Free Software Foundation, Inc. 3;; Copyright (C) 1992,95,96,98,2001,2002, 2003 Free Software Foundation, Inc.
4 4
5;; Author: James Clark <jjc@jclark.com> 5;; Author: James Clark <jjc@jclark.com>
6;; Maintainer: FSF 6;; Maintainer: FSF
@@ -263,7 +263,7 @@ Any terminating `>' or `/' is not matched.")
263 (regexp-opt (mapcar 'car sgml-tag-face-alist) t) 263 (regexp-opt (mapcar 'car sgml-tag-face-alist) t)
264 "\\([ \t][^>]*\\)?>\\([^<]+\\)</\\1>") 264 "\\([ \t][^>]*\\)?>\\([^<]+\\)</\\1>")
265 '(3 (cdr (assoc (downcase (match-string 1)) 265 '(3 (cdr (assoc (downcase (match-string 1))
266 sgml-tag-face-alist)))))))) 266 sgml-tag-face-alist)) prepend))))))
267 267
268;; for font-lock, but must be defvar'ed after 268;; for font-lock, but must be defvar'ed after
269;; sgml-font-lock-keywords-1 and sgml-font-lock-keywords-2 above 269;; sgml-font-lock-keywords-1 and sgml-font-lock-keywords-2 above