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.

This directory contains C header files containing
operating-system-specific definitions.  Each file describes a
particular operating system.  The emacs configuration script edits
../config.h to include the appropriate one of these files, and then
each emacs source file includes config.h.

template.h is a generic template for system descriptions; it describes
the parameters a system file can specify.

General XEmacs Changes
---------------------------
The following is a list of those changes made globally across all
files.  They are not marked individually in each header file.  All
other changes should be preceded by a comment /* XEmacs change */.


1. Removed all #defines of [read|write|open|close].  This is now
   handled automatically by checking the INTERRUPTIBLE_IO etc. flags.

2. Removed all instances of #undef SIGIO and replaced them with
   #define BROKEN_SIGIO.  Jamie says:

   /* use BROKEN_SIGIO instead of this kludge -- jwz */

3. All instances of HAVE_GETWD, HAVE_DUP2, HAVE_UNISTD_H, NEED_UNISTD_H,
   HAVE_GETTIMEOFDAY and NEED_REALPATH removed.  We detect these
   automatically with configure.

4. All instances of HAVE_X11 replaced with HAVE_X_WINDOWS.  We don't
   support X10 or earlier so the HAVE_X11 define was purged.

5. Most of the signal crap (e.g. redefining sigsetmask, defining
   POSIX_SIGNALS) has been removed.  There are four possible
   signal paradigms that all systems fall into, and we auto-detect
   them in configure and handle them in syssignal.h.

6. Removed references to INTERRUPT_INPUT.  XEmacs does not use
   this bizarre way of reading input.

7. Removed references to BROKEN_FIONREAD.  FIONREAD is used only
   in INTERRUPT_INPUT and in the select() emulator, neither of
   which are supported in XEmacs.

8. Removed references to NOMULTIPLEJOBS.  This is unused in XEmacs
   and in FSF Emacs.

9. Removed references to HAVE_WAIT_HEADER and WAIT_USE_INT.
   They are unnecessary with the cleaned up syswait.h in XEmacs.
   (We autodetect sys/wait.h).  Instead, #define or #undef
   HAVE_UNION_WAIT.

10. Removed BSTRING.  Not used anywhere. (If the header file
    says there are bugs in bcopy() or the like, however, a
    #define BROKEN_BCOPY is added for reference.)

11. Removed #defines of bcopy, bzero, bcmp, index, rindex.
    XEmacs makes consistent use of the ANSI-equivalent
    functions memcpy, memset, memcmp, strchr, strrchr.

12. '#define subprocesses' removed.  Use '#define NO_SUBPROCESSES'
    if they don't exist.

13. References to HAVE_VFORK removed.  configure detects this.

14. Removed references to SYSV_SYSTEM_DIR, NONSYSTEM_DIR_LIBRARY,
    HAVE_SOCKETS, HAVE_SYSVIPC.  configure detects these.

15. Removed defines of HAVE_TERMIOS, HAVE_TERMIO, and
    HAVE_TCATTR (when HAVE_TERMIOS was also defined).
    configure detects these and systty.h automatically defines
    HAVE_TCATTR when HAVE_TERMIOS is defined.

16. Removed SETPGRP_RELEASES_CTTY.  Not necessary any more, with
    fixed definitions of EMACS_SEPARATE_PROCESS_GROUP et al.

17. Removed defines of NLIST_STRUCT.  configure detects this.

18. Removed defines of _setjmp and _longjmp.  configure detects this.

19. Removed all '#define static' business.  Defines NO_REMAP instead.

20. Removed defines of HAVE_MACH_MACH_H.  configure detects this.