From 2dfdb1e0fabd9147cc1b2f2fdb5e01337515094c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= Date: Fri, 4 Jan 2019 22:45:29 +0000 Subject: [PATCH 2/2] Fix Flymake tests for GCC 8.2.0 Fixes: bug#33872 "Now you have two problems..." * lisp/progmodes/flymake-cc.el (flymake-cc--make-diagnostics): Adjust regexp. --- lisp/progmodes/flymake-cc.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/progmodes/flymake-cc.el b/lisp/progmodes/flymake-cc.el index e8069f5c17..524521d7db 100644 --- a/lisp/progmodes/flymake-cc.el +++ b/lisp/progmodes/flymake-cc.el @@ -58,13 +58,13 @@ flymake-cc--make-diagnostics (cl-loop while (search-forward-regexp - "^\\(In file included from \\)?:\\([0-9]+\\):\\([0-9]+\\):\n?\\(.*\\): \\(.*\\)$" + "^\\(In file included from \\)?:\\([0-9]+\\)\\(?::\\([0-9]+\\)\\)?:\n?\\(.*\\): \\(.*\\)$" nil t) for msg = (match-string 5) for (beg . end) = (flymake-diag-region source (string-to-number (match-string 2)) - (string-to-number (match-string 3))) + (and (match-string 3) (string-to-number (match-string 3)))) for type = (if (match-string 1) :error (assoc-default -- 2.20.0