diff options
| -rw-r--r-- | lisp/progmodes/grep.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el index 303ce2f5a15..d6387d39017 100644 --- a/lisp/progmodes/grep.el +++ b/lisp/progmodes/grep.el | |||
| @@ -206,7 +206,7 @@ See `compilation-error-screen-columns'" | |||
| 206 | (define-key map [menu-bar grep compilation-compile] | 206 | (define-key map [menu-bar grep compilation-compile] |
| 207 | '("Compile..." . compile)) | 207 | '("Compile..." . compile)) |
| 208 | (define-key map [menu-bar grep compilation-grep] | 208 | (define-key map [menu-bar grep compilation-grep] |
| 209 | '("Another grep" . grep)) | 209 | '("Another grep..." . grep)) |
| 210 | (define-key map [menu-bar grep compilation-recompile] | 210 | (define-key map [menu-bar grep compilation-recompile] |
| 211 | '("Repeat grep" . recompile)) | 211 | '("Repeat grep" . recompile)) |
| 212 | (define-key map [menu-bar grep compilation-separator2] | 212 | (define-key map [menu-bar grep compilation-separator2] |
| @@ -287,14 +287,15 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies | |||
| 287 | (": \\(.+\\): \\(?:Permission denied\\|No such \\(?:file or directory\\|device or address\\)\\)$" | 287 | (": \\(.+\\): \\(?:Permission denied\\|No such \\(?:file or directory\\|device or address\\)\\)$" |
| 288 | 1 grep-error-face) | 288 | 1 grep-error-face) |
| 289 | ;; remove match from grep-regexp-alist before fontifying | 289 | ;; remove match from grep-regexp-alist before fontifying |
| 290 | ("^Grep started.*" (0 '(face nil message nil help-echo nil mouse-face nil) t)) | ||
| 290 | ("^Grep finished \\(?:(\\(matches found\\))\\|with \\(no matches found\\)\\).*" | 291 | ("^Grep finished \\(?:(\\(matches found\\))\\|with \\(no matches found\\)\\).*" |
| 291 | (0 '(face nil message nil help-echo nil mouse-face nil) t) | 292 | (0 '(face nil message nil help-echo nil mouse-face nil) t) |
| 292 | (1 compilation-info-face nil t) | 293 | (1 compilation-info-face nil t) |
| 293 | (2 compilation-warning-face nil t)) | 294 | (2 compilation-warning-face nil t)) |
| 294 | ("^Grep \\(exited abnormally\\) with code \\([0-9]+\\).*" | 295 | ("^Grep \\(exited abnormally\\|interrupt\\|killed\\|terminated\\)\\(?:.*with code \\([0-9]+\\)\\)?.*" |
| 295 | (0 '(face nil message nil help-echo nil mouse-face nil) t) | 296 | (0 '(face nil message nil help-echo nil mouse-face nil) t) |
| 296 | (1 grep-error-face) | 297 | (1 grep-error-face) |
| 297 | (2 grep-error-face)) | 298 | (2 grep-error-face nil t)) |
| 298 | ("^.+?-[0-9]+-.*\n" (0 grep-context-face)) | 299 | ("^.+?-[0-9]+-.*\n" (0 grep-context-face)) |
| 299 | ;; Highlight grep matches and delete markers | 300 | ;; Highlight grep matches and delete markers |
| 300 | ("\\(\033\\[01;31m\\)\\(.*?\\)\\(\033\\[[0-9]*m\\)" | 301 | ("\\(\033\\[01;31m\\)\\(.*?\\)\\(\033\\[[0-9]*m\\)" |