From 34a9bf20b006e08b6321278ea9eb57b77b5dfec6 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 7 Sep 2007 03:48:30 +0000 Subject: (compilation-get-file-structure): Complete last change by also using spec-directory in the puthash. --- lisp/progmodes/compile.el | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'lisp/progmodes/compile.el') diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 96ba3f80f3..56385ca378 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -1895,8 +1895,7 @@ FILE should be (FILENAME) or (RELATIVE-FILENAME . DIRNAME). In the former case, FILENAME may be relative or absolute. The file-structure looks like this: - (list (list FILENAME [DIR-FROM-PREV-MSG]) FMT LINE-STRUCT...) -" + (list (list FILENAME [DIR-FROM-PREV-MSG]) FMT LINE-STRUCT...)" (or (gethash file compilation-locs) ;; File was not previously encountered, at least not in the form passed. ;; Let's normalize it and look again. @@ -1940,9 +1939,7 @@ The file-structure looks like this: ;; directories have the same name: ;; http://lists.gnu.org/archive/html/emacs-devel/2007-08/msg00463.html (or (gethash (cons filename spec-directory) compilation-locs) - ;; TODO should this, without spec-directory, be - ;; done at all? - (puthash (list filename) + (puthash (cons filename spec-directory) (list (list filename spec-directory) fmt) compilation-locs)) compilation-locs)))) -- cgit v1.2.3 From d40a86f9f66cc2330ef4049cdc32d184902fdf50 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 20 Sep 2007 18:56:19 +0000 Subject: (compilation-error-regexp-alist-alist): Recognize gcc's use of "note" for informational messages. --- lisp/ChangeLog | 12 ++++++++++-- lisp/progmodes/compile.el | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'lisp/progmodes/compile.el') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 42e1451455..19f28e89f1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2007-09-20 Stefan Monnier + + * wid-edit.el (widget-image-insert): Don't merge mouse-face with + neighbouring buttons. + + * progmodes/compile.el (compilation-error-regexp-alist-alist): + Recognize gcc's use of "note" for informational messages. + 2007-09-20 Glenn Morris * textmodes/tex-mode.el (tex-validate-buffer): Use paragraph @@ -7,8 +15,8 @@ 2007-09-19 Glenn Morris - * textmodes/tex-mode.el (tex-terminate-paragraph): Use - backward-paragraph. + * textmodes/tex-mode.el (tex-terminate-paragraph): + Use backward-paragraph. 2007-09-18 Stefan Monnier diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 56385ca378..a978415d59 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -233,7 +233,7 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1)) \\([0-9]+\\)\\(?:\\([.:]\\)\\([0-9]+\\)\\)?\ \\(?:-\\([0-9]+\\)?\\(?:\\3\\([0-9]+\\)\\)?\\)?:\ \\(?: *\\(\\(?:Future\\|Runtime\\)?[Ww]arning\\|W:\\)\\|\ - *\\([Ii]nfo\\(?:\\>\\|rmationa?l?\\)\\|I:\\|instantiated from\\)\\|\ + *\\([Ii]nfo\\(?:\\>\\|rmationa?l?\\)\\|I:\\|instantiated from\\|[Nn]ote\\)\\|\ \[0-9]?\\(?:[^0-9\n]\\|$\\)\\|[0-9][0-9][0-9]\\)" 1 (2 . 5) (4 . 6) (7 . 8)) -- cgit v1.2.3