diff options
| author | Richard M. Stallman <rms@gnu.org> | 2005-01-15 18:10:59 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 2005-01-15 18:10:59 +0000 |
| commit | 997690966921597b32ed2f0330df4890ecac1bb6 (patch) | |
| tree | 0a2253873fab294185699a5e57d59c64c67debb5 /lisp/replace.el | |
| parent | 5b0102e26a3eeb2136a1155b97912879ab68c6f6 (diff) | |
| download | emacs-997690966921597b32ed2f0330df4890ecac1bb6.tar.gz | |
(occur-accumulate-lines, occur-engine): Avoid warnings.
Diffstat (limited to 'lisp/replace.el')
| -rw-r--r-- | lisp/replace.el | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lisp/replace.el b/lisp/replace.el index 3520f3e2268..82b2a993fdb 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -823,9 +823,10 @@ 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 (boundp 'jit-lock-mode) jit-lock-mode + (if (and keep-props (if (boundp 'jit-lock-mode) jit-lock-mode) (text-property-not-all beg end 'fontified t)) - (jit-lock-fontify-now beg end)) + (if (fboundp 'jit-lock-fontify-now) + (jit-lock-fontify-now beg end))) (push (funcall (if keep-props #'buffer-substring @@ -1029,9 +1030,11 @@ See also `multi-occur'." endpt (line-end-position))) (setq marker (make-marker)) (set-marker marker matchbeg) - (if (and keep-props (boundp 'jit-lock-mode) jit-lock-mode + (if (and keep-props + (if (boundp 'jit-lock-mode) jit-lock-mode) (text-property-not-all begpt endpt 'fontified t)) - (jit-lock-fontify-now begpt endpt)) + (if (fboundp 'jit-lock-fontify-now) + (jit-lock-fontify-now begpt endpt))) (setq curstring (buffer-substring begpt endpt)) ;; Depropertize the string, and maybe ;; highlight the matches |