[Emacs-diffs] emacs-24 r116889: Backport cedet/ede/emacs.el change from trunk

[Glenn Morris]

------------------------------------------------------------
revno: 116889
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17160
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Tue 2014-04-01 09:27:59 -0700
message:
  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.
modified:
  lisp/cedet/ChangeLog           changelog-20100919015713-3rbr456yray5m84f-1
  lisp/cedet/ede/emacs.el        emacs.el-20091113204419-o5vbwnq5f7feedwu-11208

=== modified file 'lisp/cedet/ChangeLog'
--- a/lisp/cedet/ChangeLog      2014-03-04 08:37:48 +0000
+++ b/lisp/cedet/ChangeLog      2014-04-01 16:27:59 +0000
@@ -1,3 +1,7 @@
+2014-04-01  Glenn Morris  <address@hidden>
+
+       * ede/emacs.el (ede-emacs-version): Update AC_INIT regexp.  (Bug#17160)
+
 2014-03-04  Glenn Morris  <address@hidden>
 
        * semantic/util.el (semantic-complete-symbol):

=== modified file 'lisp/cedet/ede/emacs.el'
--- a/lisp/cedet/ede/emacs.el   2014-01-01 07:43:34 +0000
+++ b/lisp/cedet/ede/emacs.el   2014-04-01 16:27:59 +0000
@@ -116,7 +116,7 @@
        (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))
        )
        )