[Emacs-diffs] /srv/bzr/emacs/trunk r99728: * replace.el (occur-engine-line): Add optional arg `keep-props'.

[Juri Linkov]

------------------------------------------------------------
revno: 99728
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Tue 2010-03-23 17:48:09 +0200
message:
  * replace.el (occur-engine-line): Add optional arg `keep-props'.
  (occur-accumulate-lines, occur-engine): Add arg `keep-props'.
modified:
  lisp/ChangeLog
  lisp/replace.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-03-23 07:16:57 +0000
+++ b/lisp/ChangeLog    2010-03-23 15:48:09 +0000
@@ -5,6 +5,9 @@
        (occur-engine-line): New function created from duplicate code
        in `occur-accumulate-lines' and `occur-engine'.
 
+       * replace.el (occur-engine-line): Add optional arg `keep-props'.
+       (occur-accumulate-lines, occur-engine): Add arg `keep-props'.
+
 2010-03-23  Juri Linkov  <address@hidden>
 
        * finder.el: Remove TODO tasks.

=== modified file 'lisp/replace.el'
--- a/lisp/replace.el   2010-03-23 07:16:57 +0000
+++ b/lisp/replace.el   2010-03-23 15:48:09 +0000
@@ -1016,7 +1016,7 @@
        (setq count (+ count (if forwardp -1 1)))
        (setq beg (line-beginning-position)
              end (line-end-position))
-       (push (occur-engine-line beg end) result)
+       (push (occur-engine-line beg end keep-props) result)
        (forward-line (if forwardp 1 -1)))
       (nreverse result))))
 
@@ -1217,7 +1217,7 @@
                            endpt (line-end-position)))
                    (setq marker (make-marker))
                    (set-marker marker matchbeg)
-                   (setq curstring (occur-engine-line begpt endpt))
+                   (setq curstring (occur-engine-line begpt endpt keep-props))
                    ;; Highlight the matches
                    (let ((len (length curstring))
                          (start 0))
@@ -1314,7 +1314,7 @@
       ;; Return the number of matches
       globalcount)))
 
-(defun occur-engine-line (beg end)
+(defun occur-engine-line (beg end &optional keep-props)
   (if (and keep-props (if (boundp 'jit-lock-mode) jit-lock-mode)
           (text-property-not-all beg end 'fontified t))
       (if (fboundp 'jit-lock-fontify-now)