summaryrefslogtreecommitdiff
path: root/lisp/cedet/ede
diff options
context:
space:
mode:
authorDavid Engster <dengste@eml.cc>2014-09-18 22:37:19 +0200
committerDavid Engster <dengste@eml.cc>2014-09-18 22:37:19 +0200
commit46b189d794059d05c1f517ece236dbcf16a659e7 (patch)
tree23374fe6b9d9982b0d225c6f71df5999c562186f /lisp/cedet/ede
parent41932b21a2f716ec1021485c40331ee9a88a66a3 (diff)
downloademacs-46b189d794059d05c1f517ece236dbcf16a659e7.tar.gz
Do not call egrep to determine emacs version in EDE.
* ede/emacs.el (ede-emacs-version): Do not call 'egrep' to determine Emacs version (it was dead code anyway). Make sure that configure.ac or configure.in exist. (Bug#18476)
Diffstat (limited to 'lisp/cedet/ede')
-rw-r--r--lisp/cedet/ede/emacs.el9
1 files changed, 2 insertions, 7 deletions
diff --git a/lisp/cedet/ede/emacs.el b/lisp/cedet/ede/emacs.el
index 43f16da8a77..76925a66713 100644
--- a/lisp/cedet/ede/emacs.el
+++ b/lisp/cedet/ede/emacs.el
@@ -80,12 +80,6 @@ Return a tuple of ( EMACSNAME . VERSION )."
(with-current-buffer buff
(erase-buffer)
(setq default-directory (file-name-as-directory dir))
- (or (file-exists-p configure_ac)
- (setq configure_ac "configure.in"))
- ;(call-process "egrep" nil buff nil "-n" "-e" "^version=" "Makefile")
- (call-process "egrep" nil buff nil "-n" "-e" "AC_INIT" configure_ac)
- (goto-char (point-min))
- ;(re-search-forward "version=\\([0-9.]+\\)")
(cond
;; Maybe XEmacs?
((file-exists-p "version.sh")
@@ -113,7 +107,8 @@ m4_define(\\[SXEM4CS_BETA_VERSION\\], \\[\\([0-9]+\\)\\])")
;; Insert other Emacs here...
;; Vaguely recent version of GNU Emacs?
- (t
+ ((or (file-exists-p configure_ac)
+ (file-exists-p (setq configure_ac "configure.in")))
(insert-file-contents configure_ac)
(goto-char (point-min))
(re-search-forward "AC_INIT(\\(?:GNU \\)?[eE]macs,\\s-*\\([0-9.]+\\)\\s-*[,)]")