[gentoo-commits] proj/emacs:master commit in: eclass/

["Ulrich Mueller" <ulm@gentoo.org>]

commit:     0914a69ece4ac510cacd7719a6d7a11de3a8a071
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 18 20:37:34 2013 +0000
Commit:     Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 20:37:34 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=0914a69e

Make elisp-emacs-version() more robust.

---
 eclass/elisp-common.eclass | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
index dcba57b..8f6a826 100644
--- a/eclass/elisp-common.eclass
+++ b/eclass/elisp-common.eclass
@@ -173,16 +173,27 @@ BYTECOMPFLAGS="-L ."
 # Output version of currently active Emacs.
 
 elisp-emacs-version() {
-	local ret
+	local version ret
 	# The following will work for at least versions 18-24.
 	echo "(princ emacs-version)" >"${T}"/emacs-version.el
-	${EMACS} ${EMACSFLAGS} -l "${T}"/emacs-version.el
+	version=$(
+		# EMACS could be a microemacs variant that doesn't know our
+		# options and would hang in interactive mode. Redirecting stdin
+		# and unsetting TERM and DISPLAY will make most of them fail.
+		unset TERM DISPLAY
+		${EMACS} ${EMACSFLAGS} -l "${T}"/emacs-version.el </dev/null
+	)
 	ret=$?
 	rm -f "${T}"/emacs-version.el
 	if [[ ${ret} -ne 0 ]]; then
 		eerror "elisp-emacs-version: Failed to run ${EMACS}"
+		return ${ret}
+	fi
+	if [[ -z ${version} ]]; then
+		eerror "elisp-emacs-version: Could not determine Emacs version"
+		return 1
 	fi
-	return ${ret}
+	echo "${version}"
 }
 
 # @FUNCTION: elisp-need-emacs