(grep-regexp-alist): Set 5th arg `TYPE' to

0 instead of 1 to display binary file names as info file links.
(grep-error-face): Use `compilation-error-face' instead of
`font-lock-keyword-face'.
(grep-mode-font-lock-keywords): Use `compilation-info-text-face'
and `compilation-warning-text-face' instead of `font-lock-keyword-face'.
Use `compilation-error-text-face' instead of `grep-error-face'.

2 files changed, 34 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6ed747aa48c..e9d4b0cb6fc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,31 @@
+2005-08-06  Juri Linkov  <juri@jurta.org>
+
+        * progmodes/compile.el (compilation-mode-font-lock-keywords):
+        Use `compilation-text-face', `compilation-info-text-face' and
+        `compilation-error-text-face' instead of `font-lock-keyword-face'.
+        (compilation-error): New face.
+        (compilation-error-file-name): Inherit from
+        `compilation-error' instead of `font-lock-warning-face'.
+        (compilation-warning-file-name): Inherit from
+        `compilation-warning' instead of `font-lock-warning-face'.
+        (compilation-info, compilation-error-file-name)
+        (compilation-warning-file-name, compilation-info-file-name)
+        (compilation-line-number, compilation-column-number): Doc fix.
+        (compilation-error-text-face, compilation-warning-text-face)
+        (compilation-info-text-face): New face variables.
+        (compilation-line-face, compilation-column-face)
+        (compilation-enter-directory-face)
+        (compilation-leave-directory-face): Doc fix.
+        (compilation-text-face): New function.
+
+        * progmodes/grep.el (grep-regexp-alist): Set 5th arg `TYPE' to
+        0 instead of 1 to display binary file names as info file links.
+        (grep-error-face): Use `compilation-error-face' instead of
+        `font-lock-keyword-face'.
+        (grep-mode-font-lock-keywords): Use `compilation-info-text-face'
+        and `compilation-warning-text-face' instead of `font-lock-keyword-face'.
+        Use `compilation-error-text-face' instead of `grep-error-face'.
+
 2005-08-05  Kenichi Handa  <handa@m17n.org>
 
         * international/code-pages.el: Add autoload cookies for all coding
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 4378a7c253d..3af5aebfc6a 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -261,7 +261,7 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies
       (lambda () (- (match-end 5) (match-end 1)
                     (- (match-end 4) (match-beginning 4)))))
      nil 1)
-    ("^Binary file \\(.+\\) matches$" 1 nil nil 1 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,8 +272,7 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies
 (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
+(defvar grep-error-face compilation-error-face
   "Face name to use for grep error messages.")
 
 (defvar grep-match-face 'match
@@ -290,12 +289,12 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies
      ;; 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))
+      (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 grep-error-face)
-      (2 grep-error-face))
+      (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\\)"