(occur-accumulate-lines, occur-engine): Avoid warnings.

diff --git a/lisp/replace.el b/lisp/replace.el
index 3520f3e2268ad366cba48545de5fcb7176f0a1ba..82b2a993fdba4771fb2540d2bbc14d8c3ee26443 100644 (file)
--- 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