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)

diff --git a/lisp/cedet/cedet-global.el b/lisp/cedet/cedet-global.el
index a175f16d6b8ba9284704141e49c225a4f7a2a118..7d502cf60a269c2e226cfd72b12df1c2bde98ac7 100644 (file)
--- 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