diff options
| author | Daniel Pfeiffer <occitan@esperanto.org> | 2006-05-30 07:02:00 +0000 |
|---|---|---|
| committer | Daniel Pfeiffer <occitan@esperanto.org> | 2006-05-30 07:02:00 +0000 |
| commit | d14fd70ce977c14229ffc2d4945942f3ef00ce52 (patch) | |
| tree | 7f47ec123edb91eafb5a635bb04d5a283c024dc6 /lisp | |
| parent | 8088bb2ca517e6c7942550f96714e84a692589f2 (diff) | |
| download | emacs-d14fd70ce977c14229ffc2d4945942f3ef00ce52.tar.gz | |
(compilation-error-regexp-alist-alist): Add makepp diagnostic.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/progmodes/compile.el | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0cb2920ddea..7568cacaea0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2006-05-30 Daniel Pfeiffer <occitan@esperanto.org> + + * files.el (auto-mode-alist): Add makepp suffix and optional mk on + Makeppfile. + + * progmodes/compile.el (compilation-error-regexp-alist-alist): Add + makepp diagnostic. + 2006-05-29 Richard Stallman <rms@gnu.org> * help.el (temp-buffer-max-height): Doc fix. diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 527624bfc4e..799f108146f 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -228,7 +228,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:\\)\\)?" + *\\([Ii]nfo\\(?:\\>\\|rmationa?l?\\)\\|I:\\|instantiated from\\)\\)?" 1 (2 . 5) (4 . 6) (7 . 8)) (lcc @@ -236,7 +236,7 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1)) 2 3 4 (1)) (makepp - "^makepp: \\(?:\\(?:warning\\(:\\).*?\\|\\(Scanning\\|[LR]e?l?oading makefile\\) \\|.*?\\)\ + "^makepp: \\(?:\\(?:warning\\(:\\).*?\\|\\(Scanning\\|[LR]e?l?oading makefile\\|Imported\\) \\|.*?\\)\ `\\(\\(\\S +?\\)\\(?::\\([0-9]+\\)\\)?\\)['(]\\)" 4 5 nil (1 . 2) 3 ("`\\(\\(\\S +?\\)\\(?::\\([0-9]+\\)\\)?\\)['(]" nil nil |