diff options
| author | Richard M. Stallman | 2005-01-15 18:10:59 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2005-01-15 18:10:59 +0000 |
| commit | 997690966921597b32ed2f0330df4890ecac1bb6 (patch) | |
| tree | 0a2253873fab294185699a5e57d59c64c67debb5 /lisp/replace.el | |
| parent | 5b0102e26a3eeb2136a1155b97912879ab68c6f6 (diff) | |
| download | emacs-997690966921597b32ed2f0330df4890ecac1bb6.tar.gz emacs-997690966921597b32ed2f0330df4890ecac1bb6.zip | |
(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." | |||
| 823 | (setq count (+ count (if forwardp -1 1))) | 823 | (setq count (+ count (if forwardp -1 1))) |
| 824 | (setq beg (line-beginning-position) | 824 | (setq beg (line-beginning-position) |
| 825 | end (line-end-position)) | 825 | end (line-end-position)) |
| 826 | (if (and keep-props (boundp 'jit-lock-mode) jit-lock-mode | 826 | (if (and keep-props (if (boundp 'jit-lock-mode) jit-lock-mode) |
| 827 | (text-property-not-all beg end 'fontified t)) | 827 | (text-property-not-all beg end 'fontified t)) |
| 828 | (jit-lock-fontify-now beg end)) | 828 | (if (fboundp 'jit-lock-fontify-now) |
| 829 | (jit-lock-fontify-now beg end))) | ||
| 829 | (push | 830 | (push |
| 830 | (funcall (if keep-props | 831 | (funcall (if keep-props |
| 831 | #'buffer-substring | 832 | #'buffer-substring |
| @@ -1029,9 +1030,11 @@ See also `multi-occur'." | |||
| 1029 | endpt (line-end-position))) | 1030 | endpt (line-end-position))) |
| 1030 | (setq marker (make-marker)) | 1031 | (setq marker (make-marker)) |
| 1031 | (set-marker marker matchbeg) | 1032 | (set-marker marker matchbeg) |
| 1032 | (if (and keep-props (boundp 'jit-lock-mode) jit-lock-mode | 1033 | (if (and keep-props |
| 1034 | (if (boundp 'jit-lock-mode) jit-lock-mode) | ||
| 1033 | (text-property-not-all begpt endpt 'fontified t)) | 1035 | (text-property-not-all begpt endpt 'fontified t)) |
| 1034 | (jit-lock-fontify-now begpt endpt)) | 1036 | (if (fboundp 'jit-lock-fontify-now) |
| 1037 | (jit-lock-fontify-now begpt endpt))) | ||
| 1035 | (setq curstring (buffer-substring begpt endpt)) | 1038 | (setq curstring (buffer-substring begpt endpt)) |
| 1036 | ;; Depropertize the string, and maybe | 1039 | ;; Depropertize the string, and maybe |
| 1037 | ;; highlight the matches | 1040 | ;; highlight the matches |