[patch] elisp-common.eclass.patch

elisp-common.eclass.patch (text/plain), 1.10 KB, created by SpanKY on 2010-07-18 21:45:29 UTC

Index: elisp-common.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v
retrieving revision 1.65
diff -u -p -r1.65 elisp-common.eclass
--- elisp-common.eclass	29 Dec 2009 20:15:12 -0000	1.65
+++ elisp-common.eclass	18 Jul 2010 21:40:19 -0000
@@ -130,6 +130,8 @@
 #
 # elisp-emacs-version() outputs the version of the currently active Emacs.
 
+inherit eutils # eshopts_{push,pop}
+
 # @ECLASS-VARIABLE: SITELISP
 # @DESCRIPTION:
 # Directory where packages install Emacs Lisp files.
@@ -304,8 +306,7 @@ elisp-site-regen() {
 	rm -f "${sitelisp}"/00site-gentoo.el
 
 	# set nullglob option, there may be a directory without matching files
-	local old_shopts=$(shopt -p nullglob)
-	shopt -s nullglob
+	eshopts_push -s nullglob
 
 	for sf in "${sitelisp}"/[0-9][0-9]*-gentoo.el \
 		"${sitelisp}"/site-gentoo.d/[0-9][0-9]*.el
@@ -319,7 +320,7 @@ elisp-site-regen() {
 		sflist[i]=${sf}
 	done
 
-	eval "${old_shopts}"
+	eshopts_pop
 
 	cat <<-EOF >"${T}"/site-gentoo.el
 	;;; site-gentoo.el --- site initialisation for Gentoo-installed packages