From 0385470dd59ec8901be2e4748a6fa5744778dac6 Mon Sep 17 00:00:00 2001 From: Ulrich Müller Date: Sun, 12 Feb 2012 16:07:25 +0000 Subject: Require GNU Emacs in elisp-need-emacs. svn path=/emacs-overlay/; revision=1795 --- eclass/ChangeLog | 2 ++ eclass/elisp-common.eclass | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'eclass') diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 5d72de0..1f25668 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,5 +1,7 @@ 2012-02-11 Ulrich Müller + * elisp-common.eclass (elisp-need-emacs): Require GNU Emacs. + * elisp-common.eclass (elisp-site-regen): Delete declaration of unused variable. diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass index 33b8ade..80e179d 100644 --- a/eclass/elisp-common.eclass +++ b/eclass/elisp-common.eclass @@ -173,7 +173,7 @@ BYTECOMPFLAGS="-L ." elisp-emacs-version() { local ret - # The following will work for at least versions 18-23. + # 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 ret=$? @@ -195,6 +195,10 @@ elisp-need-emacs() { local need_emacs=$1 have_emacs have_emacs=$(elisp-emacs-version) || return einfo "Emacs version: ${have_emacs}" + if [[ ${have_emacs} =~ XEmacs|Lucid ]]; then + eerror "This package needs GNU Emacs." + return 1 + fi if ! [[ ${have_emacs%%.*} -ge ${need_emacs%%.*} ]]; then eerror "This package needs at least Emacs ${need_emacs%%.*}." eerror "Use \"eselect emacs\" to select the active version." -- cgit v1.2.3-18-g5258