diff options
author | Stefan Monnier <monnier@iro.umontreal.ca> | 2007-02-18 18:52:18 +0000 |
---|---|---|
committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2007-02-18 18:52:18 +0000 |
commit | dfee9538a14db844e318393dd87985941526841f (patch) | |
tree | 37b00b271bb8edc2a1f11371263488b22c8d82da | |
parent | 755b72e9d494f5d3639870d9230ea44b06e05d7e (diff) | |
download | emacs-dfee9538a14db844e318393dd87985941526841f.tar.gz |
(font-lock-extend-region-wholelines): Revert last change.
-rw-r--r-- | lisp/ChangeLog | 5 | ||||
-rw-r--r-- | lisp/font-lock.el | 40 |
2 files changed, 28 insertions, 17 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 29b3e166749..beb625604a7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -29,11 +29,6 @@ * emacs-lisp/lisp-mode.el (calculate-lisp-indent): Added indentation for the constants of Lisp. -2007-02-17 David Hansen <david.hansen@physik.fu-berlin.de> (tiny change) - - * font-lock.el (font-lock-extend-region-wholelines): Test for EOB - in addition to BOL. - 2007-02-16 Stefan Monnier <monnier@iro.umontreal.ca> * ps-print.el: Use (defvar <foo>) where applicable. diff --git a/lisp/font-lock.el b/lisp/font-lock.el index fd2dedc1dae..1e27daa89ec 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -350,7 +350,7 @@ Each element in a user-level keywords list should have one of these forms: (MATCHER . SUBEXP) (MATCHER . FACENAME) (MATCHER . HIGHLIGHT) - (MATCHER HIGHLIGHT ...) + (MATCHER . HIGHLIGHTS) (eval . FORM) where MATCHER can be either the regexp to search for, or the function name to @@ -1040,6 +1040,13 @@ The region it returns may start or end in the middle of a line.") Useful for things like RMAIL and Info where the whole buffer is not a very meaningful entity to highlight.") +(defvar font-lock-syntax-props-depend-on-themselves nil + "If non-nil, syntax-table changes may influence syntactic keywords. +If the syntax-table properties set by syntactic-keywords themselves depend +on syntax-table properties set on the text before it by syntactic-keywords, +this variable should be set to non-nil, so that whenever syntaxtic-keywords +is applied, the subsequent text is marked for syntactic re-fontification.") + (defvar font-lock-beg) (defvar font-lock-end) (defvar font-lock-extend-region-functions @@ -1087,7 +1094,7 @@ Put first the functions more likely to cause a change and cheaper to compute.") "Move fontification boundaries to beginning of lines." (let ((changed nil)) (goto-char font-lock-beg) - (unless (or (bolp) (eobp)) + (unless (bolp) (setq changed t font-lock-beg (line-beginning-position))) (goto-char font-lock-end) (unless (bolp) @@ -1124,11 +1131,25 @@ Put first the functions more likely to cause a change and cheaper to compute.") (setq beg font-lock-beg end font-lock-end)) ;; Now do the fontification. (font-lock-unfontify-region beg end) - (when font-lock-syntactic-keywords - (font-lock-fontify-syntactic-keywords-region beg end)) - (unless font-lock-keywords-only - (font-lock-fontify-syntactically-region beg end loudly)) - (font-lock-fontify-keywords-region beg end loudly)) + (let ((sbeg beg)) + (cond + ((< font-lock-syntactically-fontified sbeg) + ;; Ensure the syntax-table prop is properly set on the text + ;; before beg. + (setq sbeg (max font-lock-syntactically-fontified (point-min))) + (setq font-lock-syntactically-fontified end)) + ((and font-lock-syntax-props-depend-on-themselves + (> font-lock-syntactically-fontified end)) + ;; If the syntax-table properties set by + ;; font-lock-syntactic-keywords themselves depend on + ;; syntax-table props set in the text above it, then we'll + ;; need to update all the syntax-table props below end. + (setq font-lock-syntactically-fontified end))) + (when font-lock-syntactic-keywords + (font-lock-fontify-syntactic-keywords-region sbeg end))) + (unless font-lock-keywords-only + (font-lock-fontify-syntactically-region beg end loudly)) + (font-lock-fontify-keywords-region beg end loudly)) ;; Clean up. (set-syntax-table old-syntax-table)))) @@ -1418,11 +1439,6 @@ LIMIT can be modified by the value of its PRE-MATCH-FORM." (defun font-lock-fontify-syntactic-keywords-region (start end) "Fontify according to `font-lock-syntactic-keywords' between START and END. START should be at the beginning of a line." - ;; Ensure the beginning of the file is properly syntactic-fontified. - (when (and font-lock-syntactically-fontified - (< font-lock-syntactically-fontified start)) - (setq start (max font-lock-syntactically-fontified (point-min))) - (setq font-lock-syntactically-fontified end)) ;; If `font-lock-syntactic-keywords' is a symbol, get the real keywords. (when (symbolp font-lock-syntactic-keywords) (setq font-lock-syntactic-keywords (font-lock-eval-keywords |