From: Dan Nicolaescu Date: Tue, 8 Feb 2005 16:22:25 +0000 (+0000) Subject: (grep-regexp-alist): Match an optional ^[[K X-Git-Tag: ttn-vms-21-2-B4~2353 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e7eaabae699e4e3242ca71084fbbdbf461a2e3f5;p=emacs.git (grep-regexp-alist): Match an optional ^[[K that some versions of grep produce. (grep-mode-font-lock-keywords): Likewise. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f917dda73fa..da823b5f8cb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2005-02-08 Dan Nicolaescu + + * 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 * progmodes/gdb-ui.el (gdb-location-list): New variable. diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el index a3b1ab3abdd..ac052a893b2 100644 --- a/lisp/progmodes/grep.el +++ b/lisp/progmodes/grep.el @@ -253,7 +253,7 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies '(("^\\(.+?\\)[: \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 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies (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