(font-lock-fontify-region): Put on `font-lock'

property as well as `face' property.
(font-lock-hack-keywords): Likewise.

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index c6f28b0..87a134f 100644 (file)
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -150,6 +150,7 @@ slow things down!")
                        (nth 3 (parse-partial-sexp beg (point)
                                                   nil nil state))))
            (put-text-property beg (point) 'face font-lock-string-face)
+           (put-text-property beg (point) 'font-lock t)
            (setq state (parse-partial-sexp beg (point) nil nil state))))
       ;; Likewise for a comment.
       (if (or (nth 4 state) (nth 7 state))
@@ -162,6 +163,7 @@ slow things down!")
                        (nth 3 (parse-partial-sexp beg (point)
                                                   nil nil state))))
            (put-text-property beg (point) 'face font-lock-comment-face)
+           (put-text-property beg (point) 'font-lock t)
            (setq state (parse-partial-sexp beg (point) nil nil state))))
       ;; Find each interesting place between here and END.
       (while (and (< (point) end)
@@ -191,6 +193,7 @@ slow things down!")
                        (skip-chars-backward " \t"))
                    (error (goto-char end))))
                (put-text-property beg (point) 'face font-lock-comment-face)
+               (put-text-property beg (point) 'font-lock t)
                (setq state (parse-partial-sexp here (point) nil nil state)))
            (if (nth 3 state)
                (let ((beg (match-beginning 0)))
@@ -198,6 +201,7 @@ slow things down!")
                              (nth 3 (parse-partial-sexp here (point)
                                                         nil nil state))))
                  (put-text-property beg (point) 'face font-lock-string-face)
+                 (put-text-property beg (point) 'font-lock t)
                  (setq state (parse-partial-sexp here (point) nil nil state))))
              ))
        ;; Make sure PREV is non-nil after the loop
@@ -300,7 +304,8 @@ slow things down!")
        ;; don't fontify this keyword if we're already in some other context.
        (or (if allow-overlap-p nil (font-lock-any-properties-p s e))
            (progn
-             (put-text-property s e 'face face))))
+             (put-text-property s e 'face face)
+             (put-text-property s e 'font-lock t))))
       (if loudly (message "Fontifying %s... (regexps...%s)"
                          (buffer-name)
                          (make-string (setq count (1+ count)) ?.))))