From: Stefan Kangas <stefankangas@gmail.com>
Date: Mon, 11 Sep 2023 23:50:28 +0000 (+0200)
Subject: Match recent version of GNU global in CEDET
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=37c4f6103e7a5c4519d7c7d29a113830af260375;p=emacs.git

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 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