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.

String key values
"\033[M"		Function #1
"\033[N"		Function #2
"\033[O"		Function #3
"\033[P"		Function #4
"\033[Q"		Function #5
"\033[R"		Function #6
"\033[S"		Function #7
"\033[T"		Function #8
"\033[U"		Function #9
"\033[V"		Function #10
"\033[W"		Function #11
"\033[X"		Function #12
"\033[Y"		Shift Function #1
"\033[Z"		Shift Function #2
"\033[a"		Shift Function #3
"\033[b"		Shift Function #4
"\033[c"		Shift Function #5
"\033[d"		Shift Function #6
"\033[e"		Shift Function #7
"\033[f"		Shift Function #8
"\033[g"		Shift Function #9
"\033[h"		Shift Function #10
"\033[i"		Shift Function #11
"\033[j"		Shift Function #12
"\033[k"		Control Function #1
"\033[l"		Control Function #2
"\033[m"		Control Function #3
"\033[n"		Control Function #4
"\033[o"		Control Function #5
"\033[p"		Control Function #6
"\033[q"		Control Function #7
"\033[r"		Control Function #8
"\033[s"		Control Function #9
"\033[t"		Control Function #10
"\033[u"		Control Function #11
"\033[v"		Control Function #12
"\033[w"		Ctrl/Shft Function #1
"\033[x"		Ctrl/Shft Function #2
"\033[y"		Ctrl/Shft Function #3
"\033[z"		Ctrl/Shft Function #4
"\033[@"		Ctrl/Shft Function #5
"\033[["		Ctrl/Shft Function #6
"\033[\\"		Ctrl/Shft Function #7
"\033[]"		Ctrl/Shft Function #8
"\033[^"		Ctrl/Shft Function #9
"\033[_"		Ctrl/Shft Function #10
"\033[`"		Ctrl/Shft Function #11
"\033[{"		Ctrl/Shft Function #12
"\033[H"		Home
"\033[A"		Up arrow
"\033[I"		Page up
"\033[-"		-
"\033[D"		Left arrow
"\033[E"		5
"\033[C"		Right arrow
"\033[+"		+
"\033[F"		End
"\033[B"		Down arrow
"\033[G"		Page down
"\033[L"		Insert
"\033]A"        Shift Home
"\033]B"        Shift Up
"\033]C"        Shift PgUp
"\033]D"        Shift Left
"\033]E"        Shift Right
"\033]F"        Shift End
"\033]G"        Shift Down
"\033]H"        Shift PgDn
"\033]I"        Shift Insert
"\033]J"        Shift Delete
"\033]K"        Ctrl Home
"\033]L"        Ctrl Up
"\033]M"        Ctrl PgUp
"\033]N"        Ctrl Left
"\033]O"        Ctrl Right
"\033]P"        Ctrl End
"\033]Q"        Ctrl Down
"\033]R"        Ctrl PgDn
"\033]S"        Ctrl Insert
"\033]T"        Ctrl Delete
"\033]U"        Alt Home
"\033]V"        Alt Up
"\033]W"        Alt PgUp
"\033]X"        Alt Left
"\033]Y"        Alt Right
"\033]Z"        Alt End
"\033]a"        Alt Down
"\033]b"        Alt PgDn
"\033]c"        Alt Insert
"\033]d"        Alt Delete
"\033]e"        Ctrl Keypad +
"\033]f"        Ctrl Keypad -
"\033]g"        Ctrl Keypad 5
"\033]h"        Alt Keypad +
"\033]i"        Alt Keypad -
"\033]j"        Alt Keypad 5