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.

--- a/lisp/x-win-sun.el	Sun Jul 06 19:46:19 2008 +0300
+++ b/lisp/x-win-sun.el	Wed Jul 09 20:46:22 2008 +0200
@@ -68,7 +68,7 @@
  '(x-keysym-on-keyboard-sans-modifiers-p))
 
 ;;;###autoload
-(defun x-win-init-sun ()
+(defun x-win-init-sun (device)
 
   ;; help is ok
   ;; num_lock is ok
@@ -112,51 +112,51 @@
 
       ;; Map f33 and r13 to end or kp-end
       ,@(cond
-	 ((not (x-keysym-on-keyboard-sans-modifiers-p 'end))
+	 ((not (x-keysym-on-keyboard-sans-modifiers-p 'end device))
 	  '((f33 end)
 	    (r13 end)))
-	 ((not (x-keysym-on-keyboard-sans-modifiers-p 'kp-end))
+	 ((not (x-keysym-on-keyboard-sans-modifiers-p 'kp-end device))
 	  '((f33 kp-end)
 	    (r13 kp-end))))
 
-      ,@(when (x-keysym-on-keyboard-sans-modifiers-p 'f36)
+      ,@(when (x-keysym-on-keyboard-sans-modifiers-p 'f36 device)
 	  '((f36 stop)
 	    (f37 again)))
 
       ;; Type 4 keyboards have a real kp-subtract  and a f24 labelled `='
       ;; Type 5 keyboards have no key labelled `=' and a f24 labelled `-'
-      ,@(when (x-keysym-on-keyboard-sans-modifiers-p 'f24)
-	  `((f24 ,(if (x-keysym-on-keyboard-sans-modifiers-p 'kp-subtract)
+      ,@(when (x-keysym-on-keyboard-sans-modifiers-p 'f24 device)
+	  `((f24 ,(if (x-keysym-on-keyboard-sans-modifiers-p 'kp-subtract device)
 		      'kp-equal
 		    'kp-subtract))))
 
       ;; Map f27 to home or kp-home, as appropriate
-      ,@(cond ((not (x-keysym-on-keyboard-sans-modifiers-p 'home))
+      ,@(cond ((not (x-keysym-on-keyboard-sans-modifiers-p 'home device))
 	       '((f27 home)))
-	      ((not (x-keysym-on-keyboard-sans-modifiers-p 'kp-home))
+	      ((not (x-keysym-on-keyboard-sans-modifiers-p 'kp-home device))
 	       '((f27 kp-home))))
 
       ;; Map f29 to prior or kp-prior, as appropriate
-      ,@(cond ((not (x-keysym-on-keyboard-sans-modifiers-p 'prior))
+      ,@(cond ((not (x-keysym-on-keyboard-sans-modifiers-p 'prior device))
 	       '((f29 prior)))
-	      ((not (x-keysym-on-keyboard-sans-modifiers-p 'kp-prior))
+	      ((not (x-keysym-on-keyboard-sans-modifiers-p 'kp-prior device))
 	       '((f29 kp-prior))))
 
       ;; Map f35 to next or kp-next, as appropriate
-      ,@(cond ((not (x-keysym-on-keyboard-sans-modifiers-p 'next))
+      ,@(cond ((not (x-keysym-on-keyboard-sans-modifiers-p 'next device))
 	       '((f35 next)))
-	      ((not (x-keysym-on-keyboard-sans-modifiers-p 'kp-next))
+	      ((not (x-keysym-on-keyboard-sans-modifiers-p 'kp-next device))
 	       '((f35 kp-next))))
 
-      ,@(cond ((x-keysym-on-keyboard-sans-modifiers-p 'apRead) ; SunOS 4.1.1
+      ,@(cond ((x-keysym-on-keyboard-sans-modifiers-p 'apRead device) ; SunOS 4.1.1
 	       '((apRead f11) (apEdit f12)))
-	      ((x-keysym-on-keyboard-sans-modifiers-p 'SunF36) ; SunOS 5
+	      ((x-keysym-on-keyboard-sans-modifiers-p 'SunF36 device) ; SunOS 5
 	       '((SunF36 f11)
 		 (SunF37 f12)
 		 (f11    stop)
 		 (f12    again))))
       )
-    do (when (x-keysym-on-keyboard-sans-modifiers-p from-key)
+    do (when (x-keysym-on-keyboard-sans-modifiers-p from-key device)
 	 (dolist (prefix '(() (shift) (control) (meta) (alt)
 			   (shift control) (shift alt) (shift meta)
 			   (control alt) (control meta) (alt meta)