Don't determine whether to call general device-type code at startup, rather decide in the device-specific code itself. lisp/ChangeLog addition: 2008-07-07 Aidan Kehoe <kehoea@parhasard.net> Patch to make it up to the device-specific code whether various Lisp functions should be called during device creation, not relying on the startup code to decide this. Also, rename initial-window-system to initial-device-type (which makes more sense in this scheme), always set it. * startup.el (command-line): Use initial-device-type, not initial-window-system; just call #'make-device, leave the special behaviour to be done the first time a console type is initialised to be decided on by the respective console code. * x-init.el (x-app-defaults-directory): Declare that it should be bound. (x-define-dead-key): Have the macro take a DEVICE argument. (x-initialize-compose): Have the function take a DEVICE argument, and use it when checking if various keysyms are available on the keyboard. (x-initialize-keyboard): Have the function take a DEVICE argument, allowing device-specific keyboard initialisation. (make-device-early-x-entry-point-called-p): New. (make-device-late-x-entry-point-called-p): New. Rename pre-x-win-initted, x-win-initted. (make-device-early-x-entry-point): Rename init-pre-x-win, take the call to make-x-device out (it should be called from the device-creation code, not vice-versa). (make-device-late-x-entry-point): Rename init-post-x-win, have it take a DEVICE argument, use that DEVICE argument when working out what device-specific things need doing. Don't use create-console-hook in core code. * x-win-xfree86.el (x-win-init-xfree86): Take a DEVICE argument; use it. * x-win-sun.el (x-win-init-sun): Take a DEVICE argument; use it. * mule/mule-x-init.el: Remove #'init-mule-x-win, an empty function. * tty-init.el (make-device-early-tty-entry-point-called-p): New. Rename pre-tty-win-initted. (make-device-early-tty-entry-point): New. Rename init-pre-tty-win. (make-frame-after-init-entry-point): New. Rename init-post-tty-win to better reflect when it's called. * gtk-init.el (gtk-early-lisp-options-file): New. Move this path to a documented variable. (gtk-command-switch-alist): Wrap the docstring to fewer than 79 columns. (make-device-early-gtk-entry-point-called-p): New. (make-device-late-gtk-entry-point-called-p): New. Renamed gtk-pre-win-initted, gtk-post-win-initted to these. (make-device-early-gtk-entry-point): New. (make-device-late-gtk-entry-point): New. Renamed init-pre-gtk-win, init-post-gtk-win to these. Have make-device-late-gtk-entry-point take a device argument, and use it; have make-device-early-gtk-entry-point load the GTK-specific startup code, instead of doing that in C. (init-gtk-win): Deleted, functionality moved to the GTK device creation code. (gtk-define-dead-key): Have it take a DEVICE argument; use this argument. (gtk-initialize-compose): Ditto. * coding.el (set-terminal-coding-system): Correct the docstring; the function isn't broken. src/ChangeLog addition: 2008-07-07 Aidan Kehoe <kehoea@parhasard.net> Patch to make it up to the device-specific code whether various Lisp functions should be called during device creation, not relying on the startup code to decide this. Also, rename initial-window-system to initial-device-type (which makes more sense in this scheme), always set it. * redisplay.c (Vinitial_device_type): New. (Vinitial_window_system): Removed. Rename initial-window-system to initial-device type, making it a stream if we're noninteractive. Update its docstring. * device-x.c (Qmake_device_early_x_entry_point, Qmake_device_late_x_entry_point): New. Rename Qinit_pre_x_win, Qinit_post_x_win. (x_init_device): Call #'make-device-early-x-entry-point earlier, now we rely on it to find the application class and the app-defaults directory. (x_finish_init_device): Call #'make-device-late-x-entry-point with the created device. (Vx_app_defaults_directory): Always make this available, to simplify code in x-init.el. * device-tty.c (Qmake_device_early_tty_entry_point): New. Rename Qinit_pre_tty_win, rename Qinit_post_tty_win and move to frame-tty.c as Qmake_frame_after_init_entry_point. (tty_init_device): Call #'make-device-early-tty-entry-point before doing anything. * frame-tty.c (Qmake_frame_after_init_entry_point): New. * frame-tty.c (tty_after_init_frame): Have it call the better-named #'make-frame-after-init-entry-point function instead of #'init-post-tty-win (since it's called after frame, not device, creation). * device-msw.c (Qmake_device_early_mswindows_entry_point, Qmake_device_late_mswindows_entry_point): New. Rename Qinit_pre_mswindows_win, Qinit_post_mswindows_win. (mswindows_init_device): Call #'make-device-early-mswindows-entry-point here, instead of having its predecessor call us. (mswindows_finish_init_device): Call #'make-device-early-mswindows-entry-point, for symmetry with the other device types (though it's an empty function). * device-gtk.c (Qmake_device_early_gtk_entry_point, Qmake_device_late_gtk_entry_point): New. Rename Qinit_pre_gtk_win, Qinit_post_gtk_win. (gtk_init_device): Call #'make-device-early-gtk-entry-point; don't load ~/.xemacs/gtk-options.el ourselves, leave that to lisp. (gtk_finish_init_device): Call #'make-device-late-gtk-entry-point with the created device as an argument.

# tests for the bundled packages feature

# usage: sh etc/bundled-packages/tests.sh [TMP_TEST_DIR]

# Always run this script from the top directory of the source tree.
# You need a mv that supports the -v for verbose flag, and a mkdir that
# supports the -p flag to make parents.
# Output from this script is preceded by 4 stars (****).

# This test script is probably more fragile than the build process, but if
# it runs to completion things are probably OK.

# configure the installation target

if test -z "$1"; then
 TMP_TEST_DIR=/tmp/test/bundled-packages
else
 TMP_TEST_DIR=$1
fi

srcdir=`pwd`
blddir=${TMP_TEST_DIR}/build
pkgdir=${TMP_TEST_DIR}/lib/xemacs

echo "**** srcdir = ${srcdir}"
echo "**** blddir = ${blddir}"
echo "**** pkgdir = ${pkgdir}"

if test -e "${pkgdir}"; then
 echo "**** pkgdir (${pkgdir}) exists; bailing out."
 exit -1
fi

# mv existing tarballs out of harm's way and make a fake one

echo "**** Moving existing tarballs to etc/bundled-packages/saved."
mkdir -p etc/bundled-packages/saved
cd etc/bundled-packages
echo "**** 'mv' may error because there are no files to move.  It's harmless."
mv -v *.tar.gz saved/
cd ../..

# configure in a temporary directory

if test -e ${blddir}; then
 echo "**** blddir (${blddir}) exists; bailing out."
 exit -1
fi
mkdir -p ${blddir}
cd ${blddir}
echo "**** Running 'configure'.  This takes *several minutes*."
echo "**** Redirecting configure output to ${blddir}/beta.err."
${srcdir}/configure >beta.err 2>&1

# test check-available-packages

echo "**** This test should produce no error and no output."
make check-available-packages
cd ${srcdir}/etc/bundled-packages
echo "**** This test should explain how to install bootstrap packages."
echo "This file pretends to be a bootstrap hierarchy." > xemacs-packages
tar czf bootstrap.tar.gz xemacs-packages
rm xemacs-packages
cd ${blddir}
make check-available-packages
echo "**** This test should explain how to install all three."
cd ${srcdir}/etc/bundled-packages
echo "This file pretends to be a xemacs-packages hierarchy." > xemacs-packages
echo "This file pretends to be a mule-packages hierarchy." > mule-packages
tar czf xemacs-sumo.tar.gz xemacs-packages
tar czf xemacs-mule-sumo.tar.gz mule-packages
rm xemacs-packages mule-packages
cd ${blddir}
make check-available-packages

# test installation without package path given

echo "**** Make the 'make-path' utility needed by the installation routine."
make -C lib-src make-path
echo "**** This test should error because --with-late-packages wasn't given."
make install-bootstrap-packages

# test installation with package path given

echo "**** Running 'configure'.  This takes *several minutes*."
echo "**** Redirecting configure output to ${blddir}/beta.err."
${srcdir}/configure --with-late-packages=${pkgdir} >beta.err 2>&1
echo "**** Make the 'make-path' utility needed by the installation routine."
make -C lib-src make-path
echo "**** Test install-bootstrap-packages."
make install-bootstrap-packages
echo "**** The following should list xemacs-packages in the right place."
ls ${pkgdir}/*

#### no tests below this line ####

# put tarballs back and clean up

cd ${srcdir}/etc/bundled-packages
rm *.tar.gz
echo "**** 'mv' may error because there are no files to move.  It's harmless."
mv -v saved/*.tar.gz ../
rmdir saved
rm -rf ${blddir} ${pkgdir}
exit 0