reassign 507296 css-mode
retitle 507296 css-mode: Please set symlinks and avoid loading
/etc/emacs/site-startd.d stuff when bytecompiling
tag 507296 +patch
tag 477411 +patch
thanks
On Mon, Dec 01, 2008 at 11:04:50PM -0800, Ross Boylan wrote:
> On Mon, 2008-12-01 at 18:19 +0100, Agustin Martin wrote:
> > > Can you show the previous lines?
> install/css-mode: Handling install for emacsen flavor emacs22
> Loading /etc/emacs/site-start.d/00debian-vars.el (source)...
> Loading /etc/emacs/site-start.d/50a2ps.el (source)...
> Error while loading 50a2ps
> Loading /etc/emacs22/site-start.d/50auctex.el (source)...
> Loading /usr/share/emacs/22.2/site-lisp/auctex.el (source)...
> Loading /usr/share/emacs/22.2/site-lisp/preview-latex.el (source)...
> Loading /etc/emacs/site-start.d/50autoconf.el (source)...
> Loading /etc/emacs/site-start.d/50css-mode.el (source)...
> Loading /etc/emacs/site-start.d/50dictionaries-common.el (source)...
> Loading /var/cache/dictionaries-common/emacsen-ispell-dicts.el
> (source)...
> Error while loading 50dictionaries-common
Thanks for the feedback, Ross. Reassigning to css-mode.
Hi, Chris, I see that css-mode is loading everything from
/etc/emacs/site-start.d when byte-compiling. That causes a lot of noise and
may trigger, for no good reason, some error messages like those shown above.
I am attaching a patch dealing with this. It uses '-no-site-file' which
should work for all emacs flavours currently shipped with Debian (failed
with emacs20, which required '--no-site-file', but it is already history)
Also, please consider leaving symlinks in the target dir to files in the
source dir, also dealt with in attached patch.
You can look at this patch to emacsen policy proposed by Michael Olsen.
http://lists.debian.org/debian-emacsen/2006/11/msg00012.html
and the relevant discussion in that thread. Seems to be consensus about the
patch, although was not yet applied (I will NMU it after lenny is released
if there is no further reaction on it).
While we are playing with emacsen-install, I also include in attached patch
a proposed fix for #477411 [css-mode: obsolete as of emacs 22.2], along with
some reorganization of the FLAVOR check.
Not yet looked at html-helper-mode, but seems that #507296 also applies
there.
Cheers,
--
Agustin
diff -u css-mode-0.11/debian/emacsen-install css-mode-0.11/debian/emacsen-install
--- css-mode-0.11/debian/emacsen-install
+++ css-mode-0.11/debian/emacsen-install
@@ -8,22 +8,25 @@
FLAVOR=$1
PACKAGE=css-mode
-if [ ${FLAVOR} = emacs ]; then exit 0; fi
+case "${FLAVOR}" in
+ emacs|emacs22)
+ echo "install/${PACKAGE}: Ignoring emacsen flavor $FLAVOR."
+ exit 0;
+ ;;
+ *) echo "install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR}"
+ ;;
+esac
+
+# Do not load site files when byte-compiling. Single leading dash form
+# works also with FSF emacs >=21
+SITEFLAG="-no-site-file"
-echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR}
-
-#FLAVORTEST=`echo $FLAVOR | cut -c-6`
-#if [ ${FLAVORTEST} = xemacs ] ; then
-# SITEFLAG="-no-site-file"
-#else
-# SITEFLAG="--no-site-file"
-#fi
FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile"
ELDIR=/usr/share/emacs/site-lisp/${PACKAGE}
ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
-# Install-info-altdir does not actually exist.
+# Install-info-altdir does not actually exist.
# Maybe somebody will write it.
if test -x /usr/sbin/install-info-altdir; then
echo install/${PACKAGE}: install Info links for ${FLAVOR}
@@ -32,14 +35,19 @@
install -m 755 -d ${ELCDIR}
+
cd ${ELDIR}
FILES=`echo *.el`
-cp ${FILES} ${ELCDIR}
+
cd ${ELCDIR}
+for i in $FILES; do
+ ln -sf ${ELDIR}/$i .
+done
cat << EOF > path.el
(setq load-path (cons "." load-path) byte-compile-warnings nil)
EOF
+
${FLAVOR} ${FLAGS} ${FILES}
-rm -f *.el path.el
+rm -f path.el
exit 0
diff -u css-mode-0.11/debian/changelog css-mode-0.11/debian/changelog
--- css-mode-0.11/debian/changelog
+++ css-mode-0.11/debian/changelog
@@ -1,3 +1,13 @@
+css-mode (0.11-5.0.1) unstable; urgency=low
+
+ * debian/emacsen-install:
+ - Do not byte-compile files for emacs22 (Closes: #477411).
+ - Set symlinks to .el files and do not load site files
+ when byte-compiling (Closes: #507296).
+ - Minor cosmetic changes.
+
+ -- Agustin Martin Domingo <[EMAIL PROTECTED]> Tue, 02 Dec 2008 12:21:59 +0100
+
css-mode (0.11-5) unstable; urgency=low
* Apply patch from John Zaitseff to add additional CSS properties and
