[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 r117509: Do not call egrep to determine emacs ver
From: |
David Engster |
Subject: |
[Emacs-diffs] emacs-24 r117509: Do not call egrep to determine emacs version in EDE. |
Date: |
Thu, 18 Sep 2014 20:38:50 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117509
revision-id: address@hidden
parent: address@hidden
committer: David Engster <address@hidden>
branch nick: emacs-24
timestamp: Thu 2014-09-18 22:37:19 +0200
message:
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)
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-05-01 23:55:25 +0000
+++ b/lisp/cedet/ChangeLog 2014-09-18 20:37:19 +0000
@@ -1,3 +1,9 @@
+2014-09-18 David Engster <address@hidden>
+
+ * 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)
+
2014-05-01 Glenn Morris <address@hidden>
* ede.el (ede-project-directories, ede-check-project-directory):
=== modified file 'lisp/cedet/ede/emacs.el'
--- a/lisp/cedet/ede/emacs.el 2014-04-01 16:27:59 +0000
+++ b/lisp/cedet/ede/emacs.el 2014-09-18 20:37:19 +0000
@@ -80,12 +80,6 @@
(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 @@
;; 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-*[,)]")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 r117509: Do not call egrep to determine emacs version in EDE.,
David Engster <=