Index: emacs/lisp/progmodes/grep.el
diff -c emacs/lisp/progmodes/grep.el:1.43 emacs/lisp/progmodes/grep.el:1.44
*** emacs/lisp/progmodes/grep.el:1.43 Thu Aug 4 01:36:49 2005
--- emacs/lisp/progmodes/grep.el Sat Aug 6 01:10:19 2005
***************
*** 261,267 ****
(lambda () (- (match-end 5) (match-end 1)
(- (match-end 4) (match-beginning 4)))))
nil 1)
! ("^Binary file \\(.+\\) matches$" 1 nil nil 1 1))
"Regexp used to match grep hits. See `compilation-error-regexp-alist'.")
(defvar grep-error "grep hit"
--- 261,267 ----
(lambda () (- (match-end 5) (match-end 1)
(- (match-end 4) (match-beginning 4)))))
nil 1)
! ("^Binary file \\(.+\\) matches$" 1 nil nil 0 1))
"Regexp used to match grep hits. See `compilation-error-regexp-alist'.")
(defvar grep-error "grep hit"
***************
*** 272,279 ****
(defvar grep-hit-face compilation-info-face
"Face name to use for grep hits.")
! ;; compilation-error-face is wrong for this; it's designed to look like a
link.
! (defvar grep-error-face font-lock-keyword-face
"Face name to use for grep error messages.")
(defvar grep-match-face 'match
--- 272,278 ----
(defvar grep-hit-face compilation-info-face
"Face name to use for grep hits.")
! (defvar grep-error-face compilation-error-face
"Face name to use for grep error messages.")
(defvar grep-match-face 'match
***************
*** 290,301 ****
;; remove match from grep-regexp-alist before fontifying
("^Grep finished \\(?:(\\(matches found\\))\\|with \\(no matches
found\\)\\).*"
(0 '(face nil message nil help-echo nil mouse-face nil) t)
! (1 font-lock-keyword-face nil t)
! (2 font-lock-keyword-face nil t))
("^Grep \\(exited abnormally\\) with code \\([0-9]+\\).*"
(0 '(face nil message nil help-echo nil mouse-face nil) t)
! (1 grep-error-face)
! (2 grep-error-face))
("^[^\n-]+-[0-9]+-.*" (0 grep-context-face))
;; Highlight grep matches and delete markers
("\\(\033\\[01;31m\\)\\(.*?\\)\\(\033\\[[0-9]*m\\)"
--- 289,300 ----
;; remove match from grep-regexp-alist before fontifying
("^Grep finished \\(?:(\\(matches found\\))\\|with \\(no matches
found\\)\\).*"
(0 '(face nil message nil help-echo nil mouse-face nil) t)
! (1 compilation-info-text-face nil t)
! (2 compilation-warning-text-face nil t))
("^Grep \\(exited abnormally\\) with code \\([0-9]+\\).*"
(0 '(face nil message nil help-echo nil mouse-face nil) t)
! (1 compilation-error-text-face)
! (2 compilation-error-text-face))
("^[^\n-]+-[0-9]+-.*" (0 grep-context-face))
;; Highlight grep matches and delete markers
("\\(\033\\[01;31m\\)\\(.*?\\)\\(\033\\[[0-9]*m\\)"
_______________________________________________
Emacs-diffs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/emacs-diffs
