diff options
| author | Juri Linkov <juri@jurta.org> | 2004-12-17 16:58:54 +0000 |
|---|---|---|
| committer | Juri Linkov <juri@jurta.org> | 2004-12-17 16:58:54 +0000 |
| commit | 2c13e47b067f1a59d485c74c2b7b18d52ea29bc6 (patch) | |
| tree | f9af79ee7ed798d4bffceecf33e3c3a76b7274cb | |
| parent | 132cf96dff182358577c15bcd401eb3cd9bd6f4a (diff) | |
| download | emacs-2c13e47b067f1a59d485c74c2b7b18d52ea29bc6.tar.gz | |
(occur-accumulate-lines, occur-engine):
Make forcing deferred font-lock fontification jit-specific.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/replace.el | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e973b48e814..48efe0b4f25 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2004-12-17 Juri Linkov <juri@jurta.org> + + * replace.el (occur-accumulate-lines, occur-engine): + Make forcing deferred font-lock fontification jit-specific. + 2004-12-17 Kim F. Storm <storm@cua.dk> * mouse.el (mouse-1-click-follows-link): New defcustom. diff --git a/lisp/replace.el b/lisp/replace.el index 8f81a53bf7e..775ad0ffb05 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -799,9 +799,9 @@ If the value is nil, don't highlight the buffer names specially." (setq count (+ count (if forwardp -1 1))) (setq beg (line-beginning-position) end (line-end-position)) - (if (and keep-props font-lock-mode + (if (and keep-props (boundp 'jit-lock-mode) jit-lock-mode (text-property-not-all beg end 'fontified t)) - (font-lock-fontify-region beg end)) + (jit-lock-fontify-now beg end)) (push (funcall (if keep-props #'buffer-substring @@ -1008,9 +1008,9 @@ See also `multi-occur'." endpt (line-end-position))) (setq marker (make-marker)) (set-marker marker matchbeg) - (if (and keep-props font-lock-mode + (if (and keep-props (boundp 'jit-lock-mode) jit-lock-mode (text-property-not-all begpt endpt 'fontified t)) - (font-lock-fontify-region begpt endpt)) + (jit-lock-fontify-now begpt endpt)) (setq curstring (buffer-substring begpt endpt)) ;; Depropertize the string, and maybe ;; highlight the matches |