Mercurial > emacs
changeset 59991:a518aec8f272
(grep-regexp-alist): Match an optional ^[[K
that some versions of grep produce.
(grep-mode-font-lock-keywords): Likewise.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Tue, 08 Feb 2005 16:22:25 +0000 |
| parents | c16a4b053f44 |
| children | 6e49a3404a8e |
| files | lisp/ChangeLog lisp/progmodes/grep.el |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Feb 08 14:20:54 2005 +0000 +++ b/lisp/ChangeLog Tue Feb 08 16:22:25 2005 +0000 @@ -1,3 +1,9 @@ +2005-02-08 Dan Nicolaescu <dann@ics.uci.edu> + + * progmodes/grep.el (grep-regexp-alist): Match an optional ^[[K + that some versions of grep produce. + (grep-mode-font-lock-keywords): Likewise. + 2005-02-09 Nick Roberts <nickrob@snap.net.nz> * progmodes/gdb-ui.el (gdb-location-list): New variable.
--- a/lisp/progmodes/grep.el Tue Feb 08 14:20:54 2005 +0000 +++ b/lisp/progmodes/grep.el Tue Feb 08 16:22:25 2005 +0000 @@ -253,7 +253,7 @@ '(("^\\(.+?\\)[: \t]+\ \\([0-9]+\\)\\([.:]?\\)\\([0-9]+\\)?\ \\(?:-\\(?:\\([0-9]+\\)\\3\\)?\\.?\\([0-9]+\\)?\\)?[: \t]" 1 (2 . 5) (4 . 6)) - ("^\\(.+?\\)[:(]+\\([0-9]+\\)\\([:)]\\).*?\\(\033\\[01;41m\\)\\(.*?\\)\\(\033\\[00m\\)" + ("^\\(.+?\\)[:(]+\\([0-9]+\\)\\([:)]\\).*?\\(\033\\[01;41m\\)\\(.*?\\)\\(\033\\[00m\\(\033\\[K\\)?\\)" 1 2 ;; Calculate column positions (beg . end) of first grep match on a line ((lambda () @@ -293,7 +293,7 @@ (1 compilation-warning-face) (2 compilation-line-face)) ;; Highlight grep matches and delete markers - ("\\(\033\\[01;41m\\)\\(.*?\\)\\(\033\\[00m\\)" + ("\\(\033\\[01;41m\\)\\(.*?\\)\\(\033\\[00m\\(\033\\[K\\)?\\)" (2 grep-match-face) ((lambda (p)) (progn