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

[Colin Walters]

Index: emacs/lisp/replace.el
diff -c emacs/lisp/replace.el:1.146 emacs/lisp/replace.el:1.147
*** emacs/lisp/replace.el:1.146 Sun May 26 16:42:51 2002
--- emacs/lisp/replace.el       Sat Jun  8 16:44:42 2002
***************
*** 471,479 ****
    (setq major-mode 'occur-mode)
    (setq mode-name "Occur")
    (make-local-variable 'revert-buffer-function)
-   (set (make-local-variable 'font-lock-category-alist)
-        `((,(make-symbol "occur-match") . bold)
-        (,(make-symbol "occur-title") . underline)))
    (set (make-local-variable 'revert-buffer-function) 'occur-revert-function)
    (make-local-variable 'occur-revert-arguments)
    (run-hooks 'occur-mode-hook))
--- 471,476 ----
***************
*** 706,712 ****
                    (or nlines list-matching-lines-default-context-lines)
                    (and case-fold-search
                         (isearch-no-upper-case-p regexp t))
!                   nil nil nil nil)))
        (let* ((diff (- (length bufs) (length active-bufs)))
               (bufcount (- (length bufs) diff))
               (msg (concat
--- 703,710 ----
                    (or nlines list-matching-lines-default-context-lines)
                    (and case-fold-search
                         (isearch-no-upper-case-p regexp t))
!                   list-matching-lines-buffer-name-face
!                   nil list-matching-lines-face nil)))
        (let* ((diff (- (length bufs) (length active-bufs)))
               (bufcount (- (length bufs) diff))
               (msg (concat
***************
*** 780,787 ****
                    ;; Depropertize the string, and maybe
                    ;; highlight the matches
                    (let ((len (length curstring))
-                         (match-category (with-current-buffer out-buf
-                                           (car (nth 0 
font-lock-category-alist))))
                          (start 0))
                      (unless keep-props
                        (set-text-properties 0 len nil curstring))
--- 778,783 ----
***************
*** 790,798 ****
                        (add-text-properties (match-beginning 0)
                                             (match-end 0)
                                             (append
!                                             `(occur-match t category 
,match-category)
                                              (when match-face
!                                               `(face ,match-face)))
                                             curstring)
                        (setq start (match-end 0))))
                    ;; Generate the string to insert for this match
--- 786,794 ----
                        (add-text-properties (match-beginning 0)
                                             (match-end 0)
                                             (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
***************
*** 801,807 ****
                             (apply #'propertize (format "%6d:" lines)
                                    (append
                                     (when prefix-face
!                                      `(face prefix-face))
                                     '(occur-prefix t)))
                             curstring
                             "\n"))
--- 797,803 ----
                             (apply #'propertize (format "%6d:" lines)
                                    (append
                                     (when prefix-face
!                                      `(font-lock-face prefix-face))
                                     '(occur-prefix t)))
                             curstring
                             "\n"))
***************
*** 848,857 ****
                  (add-text-properties beg end
                                       (append
                                        (when title-face
!                                         `(face ,title-face))
!                                       `(occur-title
!                                         ,buf category
!                                         ,(car (nth 1 
font-lock-category-alist))))))
                (goto-char (point-min)))))))
        ;; Return the number of matches
        globalcount)))
--- 844,851 ----
                  (add-text-properties beg end
                                       (append
                                        (when title-face
!                                         `(font-lock-face ,title-face))
!                                       `(occur-title ,buf))))
                (goto-char (point-min)))))))
        ;; Return the number of matches
        globalcount)))