aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2014-04-01 09:01:00 -0700
committerGlenn Morris2014-04-01 09:01:00 -0700
commit06f051798b8a7ba1bc4e2a38a9a9919ac97d4880 (patch)
treee9607d586bc1501cc04fc299490d18cb491c5359
parent20253ce1696239fa1b4941dd115444aae5ae96f5 (diff)
downloademacs-06f051798b8a7ba1bc4e2a38a9a9919ac97d4880.tar.gz
emacs-06f051798b8a7ba1bc4e2a38a9a9919ac97d4880.zip
* lisp/cedet/ede/emacs.el (ede-emacs-version): Update AC_INIT regexp.
Fixes: debbugs:17160
-rw-r--r--lisp/cedet/ChangeLog4
-rw-r--r--lisp/cedet/ede/emacs.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 14a2a4270f6..5433485825b 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,7 @@
12014-04-01 Glenn Morris <rgm@gnu.org>
2
3 * ede/emacs.el (ede-emacs-version): Update AC_INIT regexp. (Bug#17160)
4
12014-03-29 Glenn Morris <rgm@gnu.org> 52014-03-29 Glenn Morris <rgm@gnu.org>
2 6
3 * ede/dired.el (ede-dired-minor-mode): Add autoload cookie. 7 * ede/dired.el (ede-dired-minor-mode): Add autoload cookie.
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]+\\)\\])")
116 (t 116 (t
117 (insert-file-contents configure_ac) 117 (insert-file-contents configure_ac)
118 (goto-char (point-min)) 118 (goto-char (point-min))
119 (re-search-forward "AC_INIT(emacs,\\s-*\\([0-9.]+\\)\\s-*)") 119 (re-search-forward "AC_INIT(\\(?:GNU \\)?[eE]macs,\\s-*\\([0-9.]+\\)\\s-*[,)]")
120 (setq ver (match-string 1)) 120 (setq ver (match-string 1))
121 ) 121 )
122 ) 122 )