>From a4a6008d96011e2517939cb8cb51624802a8c31e Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Sun, 26 May 2019 17:41:22 -0400 Subject: [PATCH 2/2] Don't fontiy text outside of SGML/XML tags (Bug#33887) * lisp/font-lock.el (font-lock-syntactic-face-function-default): New function. (font-lock-syntactic-face-function): Use it as default value. * lisp/textmodes/sgml-mode.el (sgml-font-lock-syntactic-face): New function. (sgml-mode): * lisp/nxml/nxml-mode.el (nxml-mode): Use it as font-lock-syntactic-face-function value. --- lisp/font-lock.el | 7 +++++-- lisp/nxml/nxml-mode.el | 4 +++- lisp/textmodes/sgml-mode.el | 11 +++++++++-- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/lisp/font-lock.el b/lisp/font-lock.el index 3991a4ee8e..ddf1cbdb9f 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -527,9 +527,12 @@ (defvar font-lock-syntactically-fontified 0 sometimes be slightly incorrect.") (make-variable-buffer-local 'font-lock-syntactically-fontified) +(defun font-lock-syntactic-face-function-default (state) + "Default value for `font-lock-syntactic-face-function'." + (if (nth 3 state) font-lock-string-face font-lock-comment-face)) + (defvar font-lock-syntactic-face-function - (lambda (state) - (if (nth 3 state) font-lock-string-face font-lock-comment-face)) + #'font-lock-syntactic-face-function-default "Function to determine which face to use when fontifying syntactically. The function is called with a single parameter (the state as returned by `parse-partial-sexp' at the beginning of the region to highlight) and diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el index da01b2a342..05044d66df 100644 --- a/lisp/nxml/nxml-mode.el +++ b/lisp/nxml/nxml-mode.el @@ -551,7 +551,9 @@ (define-derived-mode nxml-mode text-mode "nXML" nil ; no special syntax table (font-lock-extend-region-functions . (nxml-extend-region)) (jit-lock-contextually . t) - (font-lock-unfontify-region-function . nxml-unfontify-region))) + (font-lock-unfontify-region-function . nxml-unfontify-region) + (font-lock-syntactic-face-function + . sgml-font-lock-syntactic-face))) (with-demoted-errors (rng-nxml-mode-init))) diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el index 1df7e78afc..225fe72a01 100644 --- a/lisp/textmodes/sgml-mode.el +++ b/lisp/textmodes/sgml-mode.el @@ -329,6 +329,11 @@ (defconst sgml-font-lock-keywords-2 (defvar sgml-font-lock-keywords sgml-font-lock-keywords-1 "Rules for highlighting SGML code. See also `sgml-tag-face-alist'.") +(defun sgml-font-lock-syntactic-face (state) + "`font-lock-syntactic-face-function' for `sgml-mode'." + (and (nth 9 state) ;; Only use faces within tags. + (font-lock-syntactic-face-function-default state))) + (defvar-local sgml--syntax-propertize-ppss nil) (defun sgml--syntax-propertize-ppss (pos) @@ -573,7 +578,7 @@ (define-derived-mode sgml-mode text-mode '(sgml-xml-mode "XML" "SGML") ;; This is desirable because SGML discards a newline that appears ;; immediately after a start tag or immediately before an end tag. (setq-local paragraph-start (concat "[ \t]*$\\|\ -[ \t]*")) +\[ \t]*")) (setq-local paragraph-separate (concat paragraph-start "$")) (setq-local adaptive-fill-regexp "[ \t]*") (add-hook 'fill-nobreak-predicate 'sgml-fill-nobreak nil t) @@ -591,7 +596,9 @@ (define-derived-mode sgml-mode text-mode '(sgml-xml-mode "XML" "SGML") (setq font-lock-defaults '((sgml-font-lock-keywords sgml-font-lock-keywords-1 sgml-font-lock-keywords-2) - nil t)) + nil t nil + (font-lock-syntactic-face-function + . sgml-font-lock-syntactic-face))) (setq-local syntax-propertize-function #'sgml-syntax-propertize) (setq-local facemenu-add-face-function 'sgml-mode-facemenu-add-face-function) (setq-local sgml-xml-mode (sgml-xml-guess)) -- 2.11.0