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.

/* Hey Emacs, this is -*- C -*- code! */

/* Synched up with: Not synched with FSF. */

/* Think twice before editing this file.  Generated automatically by configure.

 The file startup.el guesses at reasonable values for load-path, exec-path,
 and lock-directory.  This means that if you move emacs and its associated
 sub-tree to a different place in the filesystem, or to a different machine,
 you won't have to do anything for it to work.

 If you define the paths in this file then they will take precedence over
 any value generated by the heuristic in startup.el.  The hardcoded paths
 will be checked to see if they are valid, in which case they will be used.
 Otherwise the editor will attempt to make its normal guess.

 See the NEWS file for a description of the heuristic used to locate the lisp
 and exec directories at startup time.  If you are looking at this file
 because you are having trouble, then you would be much better off arranging
 for those heuristics to succeed than defining the paths in this file.

   **  Let me say that again.  If you're editing this file, you're making
   **  a mistake.  Re-read the section on installation in ../etc/NEWS.

 If it defines anything, this file should define some subset of the following:

   PATH_PROGNAME        The name of the Emacs variant that's running.

   PATH_VERSION         The version id of the Emacs variant that's running.

   PATH_EXEC_PREFIX	The value of --exec-prefix.

   PATH_PREFIX		The value of --prefix.

   PATH_LOADSEARCH	The default value of `load-path'.

   PATH_MODULESEARCH	The default value of `module-load-path'.

   PATH_EARLY_PACKAGE_DIRECTORIES The value of `--with-early-packages'.
   PATH_LATE_PACKAGE_DIRECTORIES  The value of `--with-late-packages'.
   PATH_EARLY_PACKAGE_DIRECTORIES The value of `--with-last-packages'.

   PATH_PACKAGEPATH     The default value of `package-path'.

   PATH_SITE            The default location of site-specific Lisp files.

   PATH_SITE_MODULES	The default location of site-specific modules.

   PATH_EXEC		The default value of `exec-directory' and `exec-path'.
			(exec-path also contains the value of whatever is in
			the PATH environment variable.)

   PATH_DATA		The default value of `data-directory'.  This
			is where architecture-independent files are
			searched for.

   PATH_INFO		This is where the info documentation is installed.

   PATH_INFOPATH	The default value of `Info-directory-list'.
			These are additional places info files are searched
			for. */

#define PATH_PROGNAME "@PROGNAME@"

#define PATH_VERSION "@version@"

#ifdef EXEC_PREFIX_USER_DEFINED
#define PATH_EXEC_PREFIX "@EXEC_PREFIX@"
#endif

#ifdef PREFIX_USER_DEFINED
#define PATH_PREFIX "@PREFIX@"
#endif

#ifdef LISPDIR_USER_DEFINED
#define  PATH_LOADSEARCH "@LISPDIR@"
#endif

#ifdef MODULEDIR_USER_DEFINED
#define  PATH_MODULESEARCH "@MODULEDIR@"
#endif

#ifdef SITELISPDIR_USER_DEFINED
#define  PATH_SITE "@SITELISPDIR@"
#endif

#ifdef SITEMODULEDIR_USER_DEFINED
#define  PATH_SITE_MODULES "@SITEMODULEDIR@"
#endif

#ifdef EARLY_PACKAGE_DIRECTORIES_USER_DEFINED
#define PATH_EARLY_PACKAGE_DIRECTORIES "@EARLY_PACKAGE_DIRECTORIES@"
#endif

#ifdef LATE_PACKAGE_DIRECTORIES_USER_DEFINED
#define PATH_LATE_PACKAGE_DIRECTORIES "@LATE_PACKAGE_DIRECTORIES@"
#endif

#ifdef LAST_PACKAGE_DIRECTORIES_USER_DEFINED
#define PATH_LAST_PACKAGE_DIRECTORIES "@LAST_PACKAGE_DIRECTORIES@"
#endif

#ifdef PACKAGE_PATH_USER_DEFINED
#define PATH_PACKAGEPATH "@PACKAGE_PATH@"
#endif

#ifdef ARCHLIBDIR_USER_DEFINED
#define PATH_EXEC "@ARCHLIBDIR@"
#endif

#ifdef ETCDIR_USER_DEFINED
#define PATH_DATA "@ETCDIR@"
#endif

#ifdef DOCDIR_USER_DEFINED
#define PATH_DOC "@DOCDIR@"
#endif

#ifdef INFODIR_USER_DEFINED
#define PATH_INFO "@INFODIR@"
#endif

#ifdef INFOPATH_USER_DEFINED
#define PATH_INFOPATH "@INFOPATH@"
#endif