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

[Richard M . Stallman]

Index: emacs/lisp/replace.el
diff -c emacs/lisp/replace.el:1.191 emacs/lisp/replace.el:1.192
*** emacs/lisp/replace.el:1.191 Mon Nov 29 18:44:29 2004
--- emacs/lisp/replace.el       Fri Dec  3 00:19:52 2004
***************
*** 751,757 ****
      ;; In case the *Occur* buffer is visible in a nonselected window.
      (set-window-point (get-buffer-window (current-buffer)) (point))
      (occur-mode-goto-occurrence)))
- 
  
  (defcustom list-matching-lines-default-context-lines 0
    "*Default number of context lines included around `list-matching-lines' 
matches.
--- 751,756 ----
***************
*** 774,780 ****
    :type 'face
    :group 'matching)
  
! (defun occur-accumulate-lines (count &optional no-props)
    (save-excursion
      (let ((forwardp (> count 0))
          (result nil))
--- 773,779 ----
    :type 'face
    :group 'matching)
  
! (defun occur-accumulate-lines (count &optional keep-props)
    (save-excursion
      (let ((forwardp (> count 0))
          (result nil))
***************
*** 784,792 ****
                        (bobp))))
        (setq count (+ count (if forwardp -1 1)))
        (push
!        (funcall (if no-props
!                     #'buffer-substring-no-properties
!                   #'buffer-substring)
          (line-beginning-position)
          (line-end-position))
         result)
--- 783,791 ----
                        (bobp))))
        (setq count (+ count (if forwardp -1 1)))
        (push
!        (funcall (if keep-props
!                     #'buffer-substring
!                   #'buffer-substring-no-properties)
          (line-beginning-position)
          (line-end-position))
         result)
***************
*** 921,927 ****
                    (and case-fold-search
                         (isearch-no-upper-case-p regexp t))
                    list-matching-lines-buffer-name-face
!                   nil list-matching-lines-face nil)))
        (let* ((bufcount (length active-bufs))
               (diff (- (length bufs) bufcount)))
          (message "Searched %d buffer%s%s; %s match%s for `%s'"
--- 920,926 ----
                    (and case-fold-search
                         (isearch-no-upper-case-p regexp t))
                    list-matching-lines-buffer-name-face
!                   nil list-matching-lines-face t)))
        (let* ((bufcount (length active-bufs))
               (diff (- (length bufs) bufcount)))
          (message "Searched %d buffer%s%s; %s match%s for `%s'"
***************
*** 1004,1010 ****
                                             (append
                                              `(occur-match t)
                                              (when match-face
!                                               `(font-lock-face ,match-face)))
                                             curstring)
                        (setq start (match-end 0))))
                    ;; Generate the string to insert for this match
--- 1003,1013 ----
                                             (append
                                              `(occur-match t)
                                              (when match-face
!                                               ;; Use `face' rather than
!                                               ;; `font-lock-face' here
!                                               ;; so as to override faces
!                                               ;; copied from the buffer.
!                                               `(face ,match-face)))
                                             curstring)
                        (setq start (match-end 0))))
                    ;; Generate the string to insert for this match