From eb3d96092ad3fc6b8a29e5f58dafa89338ba2b58 Mon Sep 17 00:00:00 2001 From: Masatake YAMATO Date: Fri, 2 Jun 2006 02:38:53 +0000 Subject: [PATCH] (compilation-error-regexp-alist-alist::gcov-*): Almost rewrite. Underlines over all lines of gcov output are too uncomfortable to read. --- lisp/ChangeLog | 7 +++++++ lisp/progmodes/compile.el | 35 +++++++++++++++++++++++++++-------- 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f4ed60dc75e..99a3a0d04ec 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2006-06-02 Masatake YAMATO + + * progmodes/compile.el (compilation-error-regexp-alist-alist::gcov-*): + + Almost rewrite. Underlines over all lines of gcov output are too + uncomfortable to read. Suggested by Dan Nicolaescu. + 2006-06-01 Luc Teirlinck * progmodes/inf-lisp.el (inferior-lisp-mode): Doc fixes. diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 1649a2533ba..5da86972ec5 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -293,15 +293,34 @@ File = \\(.+\\), Line = \\([0-9]+\\)\\(?:, Column = \\([0-9]+\\)\\)?" \\(?:: \\(warning:\\)?\\|$\\| ),\\)" 1 2 nil (3)) (gcov-file - "^ +-: \\(0\\):Source:\\(.+\\)$" 2 1 nil 0) - (gcov-bb-file - "^ +-: \\(0\\):Object:\\(?:.+\\)$" nil 1 nil 0) - (gcov-never-called-line - "^ +\\(#####\\): +\\([0-9]+\\):.+$" nil 2 nil 2 nil - (1 compilation-error-face)) + "^ *-: *\\(0\\):Source:\\(.+\\)$" + 2 1 nil 0 nil + (1 compilation-line-face prepend) (2 compilation-info-face prepend)) + (gcov-header + "^ *-: *\\(0\\):\\(?:Object\\|Graph\\|Data\\|Runs\\|Programs\\):.+$" + nil 1 nil 0 nil + (1 compilation-line-face prepend)) + ;; Underlines over all lines of gcov output are too uncomfortable to read. + ;; However, hyperlinks embedded in the lines are useful. + ;; So I put default face on the lines; and then put + ;; compilation-*-face by manually to eliminate the underlines. + ;; The hyperlinks are still effective. + (gcov-nomark + "^ *-: *\\([1-9]\\|[0-9]\\{2,\\}\\):.*$" + nil 1 nil 0 nil + (0 'default t) + (1 compilation-line-face prepend)) (gcov-called-line - "^ *[0-9]+: +\\([1-9]\\|[0-9]\\{2,\\}\\):.*$" nil 1 nil 0) -) + "^ *\\([0-9]+\\): *\\([0-9]+\\):.*$" + nil 2 nil 0 nil + (0 'default t) + (1 compilation-info-face prepend) (2 compilation-line-face prepend)) + (gcov-never-called + "^ *\\(#####\\): *\\([0-9]+\\):.*$" + nil 2 nil 2 nil + (0 'default t) + (1 compilation-error-face prepend) (2 compilation-line-face prepend)) + ) "Alist of values for `compilation-error-regexp-alist'.") (defcustom compilation-error-regexp-alist -- 2.39.5