aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2011-02-10 14:13:31 -0500
committerStefan Monnier2011-02-10 14:13:31 -0500
commit1a0a6cefcf2863adeabaac645a0176f95a380d25 (patch)
treea0b5ea57fe82119049b2777aef790a85b2c05e86
parentb016851cb127f91a7ffa5d8295e5f3d4fdd3222a (diff)
downloademacs-1a0a6cefcf2863adeabaac645a0176f95a380d25.tar.gz
emacs-1a0a6cefcf2863adeabaac645a0176f95a380d25.zip
* lisp/progmodes/grep.el (grep-mode-font-lock-keywords): Adjust to
`message' -> `compilation-message' rename. Fixes: debbugs:8004
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/progmodes/grep.el6
2 files changed, 6 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c942f9c52ca..28f0b8d0bef 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12011-02-10 Stefan Monnier <monnier@iro.umontreal.ca> 12011-02-10 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * progmodes/grep.el (grep-mode-font-lock-keywords): Adjust to
4 `message' -> `compilation-message' rename (bug#8004).
5
3 Move keymap initialization into declaration. 6 Move keymap initialization into declaration.
4 * textmodes/enriched.el (enriched-mode-map): 7 * textmodes/enriched.el (enriched-mode-map):
5 * textmodes/bib-mode.el (bib-mode-map): 8 * textmodes/bib-mode.el (bib-mode-map):
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 4bab8a18dee..32ab52228f9 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -388,13 +388,13 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies
388 1 grep-error-face) 388 1 grep-error-face)
389 ;; remove match from grep-regexp-alist before fontifying 389 ;; remove match from grep-regexp-alist before fontifying
390 ("^Grep[/a-zA-z]* started.*" 390 ("^Grep[/a-zA-z]* started.*"
391 (0 '(face nil message nil help-echo nil mouse-face nil) t)) 391 (0 '(face nil compilation-message nil help-echo nil mouse-face nil) t))
392 ("^Grep[/a-zA-z]* finished \\(?:(\\(matches found\\))\\|with \\(no matches found\\)\\).*" 392 ("^Grep[/a-zA-z]* finished \\(?:(\\(matches found\\))\\|with \\(no matches found\\)\\).*"
393 (0 '(face nil message nil help-echo nil mouse-face nil) t) 393 (0 '(face nil compilation-message nil help-echo nil mouse-face nil) t)
394 (1 compilation-info-face nil t) 394 (1 compilation-info-face nil t)
395 (2 compilation-warning-face nil t)) 395 (2 compilation-warning-face nil t))
396 ("^Grep[/a-zA-z]* \\(exited abnormally\\|interrupt\\|killed\\|terminated\\)\\(?:.*with code \\([0-9]+\\)\\)?.*" 396 ("^Grep[/a-zA-z]* \\(exited abnormally\\|interrupt\\|killed\\|terminated\\)\\(?:.*with code \\([0-9]+\\)\\)?.*"
397 (0 '(face nil message nil help-echo nil mouse-face nil) t) 397 (0 '(face nil compilation-message nil help-echo nil mouse-face nil) t)
398 (1 grep-error-face) 398 (1 grep-error-face)
399 (2 grep-error-face nil t)) 399 (2 grep-error-face nil t))
400 ("^.+?-[0-9]+-.*\n" (0 grep-context-face)) 400 ("^.+?-[0-9]+-.*\n" (0 grep-context-face))