From: Glenn Morris <rgm@gnu.org>
Date: Tue, 1 Apr 2014 16:27:59 +0000 (-0700)
Subject: Backport cedet/ede/emacs.el change from trunk
X-Git-Tag: emacs-24.3.90~61
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8ec45bab98ad308c630801146eb85488800a4246;p=emacs.git

Backport cedet/ede/emacs.el change from trunk
In case anyone uses 24.4 to edit trunk Emacs sources

* lisp/cedet/ede/emacs.el (ede-emacs-version): Update AC_INIT regexp.

Fixes: debbugs:17160
---

diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index fbe32ff610b..51339cebe60 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-01  Glenn Morris  <rgm@gnu.org>
+
+	* ede/emacs.el (ede-emacs-version): Update AC_INIT regexp.  (Bug#17160)
+
 2014-03-04  Glenn Morris  <rgm@gnu.org>
 
 	* semantic/util.el (semantic-complete-symbol):
diff --git a/lisp/cedet/ede/emacs.el b/lisp/cedet/ede/emacs.el
index 0b237806784..43f16da8a77 100644
--- a/lisp/cedet/ede/emacs.el
+++ b/lisp/cedet/ede/emacs.el
@@ -116,7 +116,7 @@ m4_define(\\[SXEM4CS_BETA_VERSION\\], \\[\\([0-9]+\\)\\])")
        (t
 	(insert-file-contents configure_ac)
 	(goto-char (point-min))
-	(re-search-forward "AC_INIT(emacs,\\s-*\\([0-9.]+\\)\\s-*)")
+	(re-search-forward "AC_INIT(\\(?:GNU \\)?[eE]macs,\\s-*\\([0-9.]+\\)\\s-*[,)]")
 	(setq ver (match-string 1))
 	)
        )