master 37c4f6103e7: Match recent version of GNU global in CEDET

[Stefan Kangas]

branch: master
commit 37c4f6103e7a5c4519d7c7d29a113830af260375
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>

    Match recent version of GNU global in CEDET
    
    * lisp/cedet/cedet-global.el (cedet-gnu-global-version-check):
    Match recent version of GNU global.  (Bug#62581)
---
 lisp/cedet/cedet-global.el | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lisp/cedet/cedet-global.el b/lisp/cedet/cedet-global.el
index a175f16d6b8..7d502cf60a2 100644
--- a/lisp/cedet/cedet-global.el
+++ b/lisp/cedet/cedet-global.el
@@ -152,7 +152,14 @@ return nil."
          nil)
       (with-current-buffer b
        (goto-char (point-min))
-       (re-search-forward "(?GNU GLOBAL)? \\([0-9.]+\\)" nil t)
+        (re-search-forward
+         (rx (or
+              ;; global (Global) 6.6.10
+              "global (Global)"
+              (seq (opt "(") "GNU GLOBAL" (opt ")")))
+             " "
+             (group (one-or-more (any "0-9."))))
+         nil t)
        (setq rev (match-string 1))
         (if (version< rev cedet-global-min-version)
            (if noerror