[Emacs-diffs] master 04d3315 2/2: Fix Flymake tests for GCC 8.2.0

[João Távora]

branch: master
commit 04d3315271cd1357fbbc192505d00c760be02952
Author: João Távora <address@hidden>
Commit: João Távora <address@hidden>

    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 e8069f5..524521d 100644
--- a/lisp/progmodes/flymake-cc.el
+++ b/lisp/progmodes/flymake-cc.el
@@ -58,13 +58,13 @@ SOURCE."
   (cl-loop
    while
    (search-forward-regexp
-    "^\\(In file included from 
\\)?<stdin>:\\([0-9]+\\):\\([0-9]+\\):\n?\\(.*\\): \\(.*\\)$"
+    "^\\(In file included from 
\\)?<stdin>:\\([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