view lib-src/config.values.in @ 4477:e34711681f30

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.
author Aidan Kehoe <kehoea@parhasard.net>
date Wed, 09 Jul 2008 20:46:22 +0200
parents 873bc64d16da
children 772c80e0e180
line wrap: on
line source

;;; Do not edit this file!
;;; This file was automatically generated, by the config.values.sh script,
;;; from configure, which was itself automatically generated from configure.in.
;;;
;;; See lisp/config.el for details on how this file is used.
;;;
;;; You are trapped in a twisty maze of strange-looking files, all autogenerated...

;;; configure        is created, from configure.in,     by autoconf
;;; config.values.in is created, from configure,        by config.values.sh
;;; config.values    is created, from config.values.in, by configure
;;; config.values    is read by lisp/config.el,
;;;                  to create the (Lisp object) config-value-hash-table

;;; Variables defined in configure by AC_SUBST follow:
;;; (These are used in Makefiles)

ALLOCA "@ALLOCA@"
ARCHLIBDIR "@ARCHLIBDIR@"
ARCHLIBDIR_USER_DEFINED "@ARCHLIBDIR_USER_DEFINED@"
CC "@CC@"
CFLAGS "@CFLAGS@"
CPP "@CPP@"
CPPFLAGS "@CPPFLAGS@"
DEFS "@DEFS@"
DOCDIR "@DOCDIR@"
DOCDIR_USER_DEFINED "@DOCDIR_USER_DEFINED@"
EARLY_PACKAGE_DIRECTORIES "@EARLY_PACKAGE_DIRECTORIES@"
EARLY_PACKAGE_DIRECTORIES_USER_DEFINED "@EARLY_PACKAGE_DIRECTORIES_USER_DEFINED@"
ECHO_C "@ECHO_C@"
ECHO_N "@ECHO_N@"
ECHO_T "@ECHO_T@"
EGREP "@EGREP@"
ETCDIR "@ETCDIR@"
ETCDIR_USER_DEFINED "@ETCDIR_USER_DEFINED@"
EXEC_PREFIX "@EXEC_PREFIX@"
EXEC_PREFIX_USER_DEFINED "@EXEC_PREFIX_USER_DEFINED@"
EXEEXT "@EXEEXT@"
GTK_CONFIG "@GTK_CONFIG@"
INFODIR "@INFODIR@"
INFODIR_USER_DEFINED "@INFODIR_USER_DEFINED@"
INFOPATH "@INFOPATH@"
INFOPATH_USER_DEFINED "@INFOPATH_USER_DEFINED@"
INSTALL "@INSTALL@"
INSTALLPATH "@INSTALLPATH@"
INSTALL_ARCH_DEP_SUBDIR "@INSTALL_ARCH_DEP_SUBDIR@"
INSTALL_DATA "@INSTALL_DATA@"
INSTALL_PROGRAM "@INSTALL_PROGRAM@"
INSTALL_SCRIPT "@INSTALL_SCRIPT@"
LAST_PACKAGE_DIRECTORIES "@LAST_PACKAGE_DIRECTORIES@"
LAST_PACKAGE_DIRECTORIES_USER_DEFINED "@LAST_PACKAGE_DIRECTORIES_USER_DEFINED@"
LATE_PACKAGE_DIRECTORIES "@LATE_PACKAGE_DIRECTORIES@"
LATE_PACKAGE_DIRECTORIES_USER_DEFINED "@LATE_PACKAGE_DIRECTORIES_USER_DEFINED@"
LDFLAGS "@LDFLAGS@"
LIBOBJS "@LIBOBJS@"
LIBS "@LIBS@"
LIBSTDCPP "@LIBSTDCPP@"
LISPDIR "@LISPDIR@"
LISPDIR_USER_DEFINED "@LISPDIR_USER_DEFINED@"
LN_S "@LN_S@"
LTLIBOBJS "@LTLIBOBJS@"
MAKE_DOCFILE "@MAKE_DOCFILE@"
MAKE_SUBDIR "@MAKE_SUBDIR@"
MODARCHDIR "@MODARCHDIR@"
MODCFLAGS "@MODCFLAGS@"
MODULEDIR "@MODULEDIR@"
MODULEDIR_USER_DEFINED "@MODULEDIR_USER_DEFINED@"
MOD_CC "@MOD_CC@"
MOD_INSTALL_PROGRAM "@MOD_INSTALL_PROGRAM@"
OBJECT_TO_BUILD "@OBJECT_TO_BUILD@"
OBJEXT "@OBJEXT@"
PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@"
PACKAGE_NAME "@PACKAGE_NAME@"
PACKAGE_PATH "@PACKAGE_PATH@"
PACKAGE_PATH_USER_DEFINED "@PACKAGE_PATH_USER_DEFINED@"
PACKAGE_STRING "@PACKAGE_STRING@"
PACKAGE_TARNAME "@PACKAGE_TARNAME@"
PACKAGE_VERSION "@PACKAGE_VERSION@"
PATH_SEPARATOR "@PATH_SEPARATOR@"
PREFIX "@PREFIX@"
PREFIX_USER_DEFINED "@PREFIX_USER_DEFINED@"
PROGNAME "@PROGNAME@"
RANLIB "@RANLIB@"
RECURSIVE_MAKE_ARGS "@RECURSIVE_MAKE_ARGS@"
SET_MAKE "@SET_MAKE@"
SHELL "@SHELL@"
SITELISPDIR "@SITELISPDIR@"
SITELISPDIR_USER_DEFINED "@SITELISPDIR_USER_DEFINED@"
SITEMODULEDIR "@SITEMODULEDIR@"
SITEMODULEDIR_USER_DEFINED "@SITEMODULEDIR_USER_DEFINED@"
SRC_SUBDIR_DEPS "@SRC_SUBDIR_DEPS@"
SUBDIR_MAKEFILES "@SUBDIR_MAKEFILES@"
XEMACS_CC "@XEMACS_CC@"
XE_CFLAGS "@XE_CFLAGS@"
X_CFLAGS "@X_CFLAGS@"
X_EXTRA_LIBS "@X_EXTRA_LIBS@"
X_LIBS "@X_LIBS@"
X_PRE_LIBS "@X_PRE_LIBS@"
YACC "@YACC@"
abs_builddir "@abs_builddir@"
abs_srcdir "@abs_srcdir@"
abs_top_builddir "@abs_top_builddir@"
abs_top_srcdir "@abs_top_srcdir@"
ac_ct_CC "@ac_ct_CC@"
ac_ct_RANLIB "@ac_ct_RANLIB@"
archlibdir "@archlibdir@"
bindir "@bindir@"
bitmapdir "@bitmapdir@"
blddir "@blddir@"
build "@build@"
build_alias "@build_alias@"
build_cpu "@build_cpu@"
build_os "@build_os@"
build_vendor "@build_vendor@"
builddir "@builddir@"
c_switch_all "@c_switch_all@"
c_switch_general "@c_switch_general@"
c_switch_window_system "@c_switch_window_system@"
canna_libs "@canna_libs@"
configuration "@configuration@"
configure_input "@configure_input@"
datadir "@datadir@"
datarootdir "@datarootdir@"
dll_cflags "@dll_cflags@"
dll_ld "@dll_ld@"
dll_ldflags "@dll_ldflags@"
dll_ldo "@dll_ldo@"
dll_post "@dll_post@"
dnd_objs "@dnd_objs@"
docdir "@docdir@"
dynodump_arch "@dynodump_arch@"
early_packages "@early_packages@"
etcdir "@etcdir@"
exec_prefix "@exec_prefix@"
extra_includes "@extra_includes@"
extra_objs "@extra_objs@"
have_esd_config "@have_esd_config@"
host_alias "@host_alias@"
includedir "@includedir@"
infodir "@infodir@"
infopath "@infopath@"
install_pp "@install_pp@"
inststaticdir "@inststaticdir@"
instvardir "@instvardir@"
internal_makefile_list "@internal_makefile_list@"
last_packages "@last_packages@"
late_packages "@late_packages@"
ld "@ld@"
ld_dynamic_link_flags "@ld_dynamic_link_flags@"
ld_libs_all "@ld_libs_all@"
ld_libs_general "@ld_libs_general@"
ld_libs_window_system "@ld_libs_window_system@"
ld_switch_all "@ld_switch_all@"
ld_switch_general "@ld_switch_general@"
ld_switch_shared "@ld_switch_shared@"
ld_switch_window_system "@ld_switch_window_system@"
ldap_libs "@ldap_libs@"
lib_gcc "@lib_gcc@"
libdir "@libdir@"
libexecdir "@libexecdir@"
libs_xauth "@libs_xauth@"
lispdir "@lispdir@"
localstatedir "@localstatedir@"
lwlib_objs "@lwlib_objs@"
machfile "@machfile@"
mandir "@mandir@"
moduledir "@moduledir@"
native_sound_lib "@native_sound_lib@"
oldincludedir "@oldincludedir@"
opsysfile "@opsysfile@"
package_path "@package_path@"
postgresql_libs "@postgresql_libs@"
prefix "@prefix@"
program_transform_name "@program_transform_name@"
sbindir "@sbindir@"
sharedstatedir "@sharedstatedir@"
sitelispdir "@sitelispdir@"
sitemoduledir "@sitemoduledir@"
sound_cflags "@sound_cflags@"
srcdir "@srcdir@"
start_files "@start_files@"
start_flags "@start_flags@"
statedir "@statedir@"
sysconfdir "@sysconfdir@"
target_alias "@target_alias@"
top_builddir "@top_builddir@"
top_srcdir "@top_srcdir@"
version "@version@"
with_modules "@with_modules@"

;;; Variables defined in configure by AC_DEFINE and AC_DEFINE_UNQUOTED follow:
;;; (These are used in C code)