# HG changeset patch
# User Colin Walters <walters@gnu.org>
# Date 1020829999 0
# Node ID 2a245e4bdf594642ab1caf7b868ca1e6c6ebb3e6
# Parent  bb718602e8103ad7d7b3675f8a8a8db5e5afb075
(occur-unfontify-region-function): Delete.
(occur-mode): Don't use it.
(occur-engine): Respect `keep-props'.
(occur-accumulate-lines): If we're moving forward, decrement; don't
increment, and vice versa.

diff -r bb718602e810 -r 2a245e4bdf59 lisp/replace.el
--- a/lisp/replace.el	Wed May 08 03:52:52 2002 +0000
+++ b/lisp/replace.el	Wed May 08 03:53:19 2002 +0000
@@ -468,8 +468,7 @@
   (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)))
+	     (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,7 +586,7 @@
 		      (if forwardp
 			  (eobp)
 			(bobp))))
-	(setq count (+ count (if forwardp 1 -1)))
+	(setq count (+ count (if forwardp -1 1)))
 	(push
 	 (funcall (if no-props
 		      #'buffer-substring-no-properties
@@ -803,9 +802,9 @@
 			      ;; concatenate them all together.
 			      (apply #'concat
 				     (nconc
-				      (occur-engine-add-prefix (nreverse (cdr (occur-accumulate-lines (- (1+ nlines)) t))))
+				      (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) t))))))))
+				      (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))
@@ -863,10 +862,6 @@
 	    (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
 ;; to make that display both SPC and Y.