summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoão Távora <joaotavora@gmail.com>2019-03-28 17:47:43 +0000
committerJoão Távora <joaotavora@gmail.com>2019-07-02 15:20:16 +0100
commitf75e68fc9be2e7d9e3da46a83204ea88e4854174 (patch)
treee0264aa8913ad635c070712920e10b9a5830c461
parentb25d58c956a9fcd2b81b804699573ea851bd8fde (diff)
downloademacs-f75e68fc9be2e7d9e3da46a83204ea88e4854174.tar.gz
Revert "Avoid occasional confusion of Flymake C/C++ backend"
This reverts commit 67c3a3af1d9e2582193d5ea33b6c190e79ad56e6, which creates more problems than it solves.
-rw-r--r--lisp/progmodes/flymake-cc.el4
1 files changed, 1 insertions, 3 deletions
diff --git a/lisp/progmodes/flymake-cc.el b/lisp/progmodes/flymake-cc.el
index 248c95a256f..1b449bd0793 100644
--- a/lisp/progmodes/flymake-cc.el
+++ b/lisp/progmodes/flymake-cc.el
@@ -58,9 +58,7 @@ SOURCE."
(cl-loop
while
(search-forward-regexp
- (concat
- "^\\(In file included from \\)?<stdin>:\\([0-9]+\\)\\(?::\\([0-9]+\\)\\)"
- "?:[\n ]?\\(error\\|warning\\|note\\): \\(.*\\)$")
+ "^\\(In file included from \\)?<stdin>:\\([0-9]+\\)\\(?::\\([0-9]+\\)\\)?:\n?\\(.*\\): \\(.*\\)$"
nil t)
for msg = (match-string 5)
for (beg . end) = (flymake-diag-region