diff options
| author | Juri Linkov <juri@linkov.net> | 2018-12-19 01:10:09 +0200 |
|---|---|---|
| committer | Juri Linkov <juri@linkov.net> | 2018-12-19 01:10:09 +0200 |
| commit | fb16313025dcbe2f010a79072536aeab000eaf80 (patch) | |
| tree | 5ece6b88f047bcd868df6650baaf23ec456cc1ab /lisp/replace.el | |
| parent | 8cbbf4ba25bef2c6c1b525aa380a1cd3f0b0d012 (diff) | |
| download | emacs-fb16313025dcbe2f010a79072536aeab000eaf80.tar.gz | |
More font-lock improvements for diff-mode
* lisp/vc/diff-mode.el (diff-font-lock-keywords): Use diff-header face
for git index lines (like already used for bzr index lines).
Use diff-file-header face for binary file headers.
(diff-find-source-location): Use expand-file-name for vc-find-revision.
(diff--font-lock-prettify): Use diff-indicator-* faces for
left-fringe indicators.
(diff-syntax-fontify-props): Optimize to not use text-property-not-all
for font-lock-ensure.
* lisp/replace.el (occur-engine-line): Simplify to use font-lock-ensure
without text-property-not-all.
Diffstat (limited to 'lisp/replace.el')
| -rw-r--r-- | lisp/replace.el | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lisp/replace.el b/lisp/replace.el index dcae12e9b76..b8f231eb55d 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -1907,10 +1907,8 @@ See also `multi-occur'." global-matches))) (defun occur-engine-line (beg end &optional keep-props) - (if (and keep-props (if (boundp 'jit-lock-mode) jit-lock-mode) - (text-property-not-all beg end 'fontified t)) - (if (fboundp 'jit-lock-fontify-now) - (jit-lock-fontify-now beg end))) + (if (and keep-props font-lock-mode) + (font-lock-ensure beg end)) (if (and keep-props (not (eq occur-excluded-properties t))) (let ((str (buffer-substring beg end))) (remove-list-of-text-properties |