Mercurial > emacs
diff lisp/replace.el @ 59570:3d6f4d8e0b8b
(occur-accumulate-lines, occur-engine): Avoid warnings.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sat, 15 Jan 2005 18:10:59 +0000 |
| parents | fea2bcedb7bf |
| children | aac0a33f5772 cb67264d6096 |
line wrap: on
line diff
--- a/lisp/replace.el Sat Jan 15 18:10:12 2005 +0000 +++ b/lisp/replace.el Sat Jan 15 18:10:59 2005 +0000 @@ -823,9 +823,10 @@ (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 @@ 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
