[Emacs-diffs] Changes to emacs/lisp/replace.el

[Colin Walters]

Index: emacs/lisp/replace.el
diff -c emacs/lisp/replace.el:1.139 emacs/lisp/replace.el:1.140
*** emacs/lisp/replace.el:1.139 Thu May  2 17:22:47 2002
--- emacs/lisp/replace.el       Tue May  7 23:53:19 2002
***************
*** 468,475 ****
    (make-local-variable 'revert-buffer-function)
    (set (make-local-variable 'font-lock-defaults)
         '(nil t nil nil nil
!            (font-lock-fontify-region-function . occur-fontify-region-function)
!            (font-lock-unfontify-region-function . 
occur-unfontify-region-function)))
    (setq revert-buffer-function 'occur-revert-function)
    (set (make-local-variable 'revert-buffer-function) 'occur-revert-function)
    (make-local-variable 'occur-revert-arguments)
--- 468,474 ----
    (make-local-variable 'revert-buffer-function)
    (set (make-local-variable 'font-lock-defaults)
         '(nil t nil nil nil
!            (font-lock-fontify-region-function . 
occur-fontify-region-function)))
    (setq revert-buffer-function 'occur-revert-function)
    (set (make-local-variable 'revert-buffer-function) 'occur-revert-function)
    (make-local-variable 'occur-revert-arguments)
***************
*** 587,593 ****
                      (if forwardp
                          (eobp)
                        (bobp))))
!       (setq count (+ count (if forwardp 1 -1)))
        (push
         (funcall (if no-props
                      #'buffer-substring-no-properties
--- 586,592 ----
                      (if forwardp
                          (eobp)
                        (bobp))))
!       (setq count (+ count (if forwardp -1 1)))
        (push
         (funcall (if no-props
                      #'buffer-substring-no-properties
***************
*** 803,811 ****
                              ;; concatenate them all together.
                              (apply #'concat
                                     (nconc
!                                     (occur-engine-add-prefix (nreverse (cdr 
(occur-accumulate-lines (- (1+ nlines)) t))))
                                      (list out-line)
!                                     (occur-engine-add-prefix (cdr 
(occur-accumulate-lines (1+ nlines) t))))))))
                      ;; Actually insert the match display data
                      (with-current-buffer out-buf
                        (let ((beg (point))
--- 802,810 ----
                              ;; concatenate them all together.
                              (apply #'concat
                                     (nconc
!                                     (occur-engine-add-prefix (nreverse (cdr 
(occur-accumulate-lines (- (1+ nlines)) keep-props))))
                                      (list out-line)
!                                     (occur-engine-add-prefix (cdr 
(occur-accumulate-lines (1+ nlines) keep-props))))))))
                      ;; Actually insert the match display data
                      (with-current-buffer out-buf
                        (let ((beg (point))
***************
*** 862,871 ****
                                                             end))
            (goto-char change-end))))))
    (when verbose (message "Fontifying...done")))
- 
- (defun occur-unfontify-region-function (beg end)
-   (let ((inhibit-read-only t))
-     (remove-text-properties beg end '(face nil))))
  
  
  ;; It would be nice to use \\[...], but there is no reasonable way
--- 861,866 ----