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 file is part of XEmacs.

XEmacs is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
Free Software Foundation; either version 2, or (at your option) any
later version.

XEmacs is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
for more details.

You should have received a copy of the GNU General Public License
along with XEmacs; see the file COPYING.  If not, write to
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.  */

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

/* Authorship:

   JWZ: long ago.
 */

/* Sun's standard and GCC's header files leave out prototypes for
   all sorts of functions. */

#ifndef INCLUDED_broken_sun_h_
#define INCLUDED_broken_sun_h_

#ifdef __GNUC__
#include <stdlib.h>
#include <stddef.h>

/*********************** stdlib functions *********************/

/* void *	memchr (const void *, int, size_t); */

/* int	memcmp (const void *, const void *, size_t); */
/* void *	memcpy (void *, const void *, size_t); */
/* void *	memmove (void *, const void *, size_t);*/
/* void *	memset (void *, int, int); */
/* char *	strcat (char *, const char *); */
/* char *	strchr (const char *, int); */
/* int	strcmp (const char *, const char *); */

/* Yes, they even left these functions out! */
int      tolower (int);
int      toupper (int);

/*********************** stdio functions *********************/

#include <stdio.h> /* else can't declare FILE */

/* FILE	*fopen (const char *, const char *); */
/* FILE	*freopen (const char *, const char *, FILE *); */
FILE	*tmpfile (void);
int	fclose (FILE *);
char	*fgets (char *, int, FILE *);
int      fgetc (FILE *);
int      fflush (FILE *);
int      fprintf (FILE *, const char *, ...);
int      fputc (char, FILE *);
int      fputs (const char *, FILE *);
size_t   fread (void *, size_t, size_t, FILE *);
int      fscanf (FILE *, const char *, ...);
int	fgetpos (FILE *, long *);
int      fseek (FILE *, long, int);
int	fsetpos (FILE *, const long *);
long     ftell (FILE *);
size_t   fwrite (const void *, size_t, size_t, FILE *);
char	*gets (char *);
int	pclose (FILE *);
void     perror (const char *);
int      printf (const char *, ...);
int      puts (const char *);
int      remove (const char *);
int      rename (const char *, const char *);
int      rewind (FILE *);
int	scanf (const char *, ...);
int	sscanf (const char *, const char *, ...);
void 	setbuf (FILE *, char *);
int 	setvbuf (FILE *, char *, int, size_t);
int	ungetc (int, FILE *);
int	vprintf (const char *, void *);
int	vfprintf (FILE *, const char *, void *);
char	*vsprintf (char *, const char *, void *);

/*********************** signal functions *********************/

int	sigblock (int);
#ifndef sigmask
int	sigmask (int);
#endif
int	sigsetmask (int);
int	sigpause (int);

/*********************** time functions ***********************/

struct timeval;
struct timezone;

int	utimes (const char *, struct timeval *);
void	tzset (void);
time_t	time (time_t *);
int	gettimeofday (struct timeval *, struct timezone *);

/*********************** file-system functions *********************/

/* Ilya Golubev reports that stat can be a #define on some systems.
   Presumably none of the systems this file is used for, and I don't
   know what file to include on a system known to be broken, anyway. */
struct stat;
#include </usr/include/sys/types.h>

int	fsync (int);
int	lstat (const char *, struct stat *);
int	fchmod (int, mode_t);
char	*mktemp (char *);
/* int	creat (const char *, mode_t); better no decl than a conflicting one... */
int	symlink (const char *, const char *);
int	readlink (const char *, char *, int);
void	sync (void);
int	select (int, fd_set *, fd_set *, fd_set *, struct timeval *);
char *	getwd (char *);
/* int	lseek (int, long, int); better no decl than a conflicting one... */
int	_filbuf ();
int	_flsbuf ();

/**************** interprocess communication functions ******************/

int	recv (int, char *, int, int);
int	socket (int, int, int);
struct sockaddr;
int	connect (int, struct sockaddr *, int);
int	bind (int, struct sockaddr *, int);
int	listen (int, int);
int	accept (int, struct sockaddr *, int *);
int	gethostname (char *, int);
struct rusage;
int	wait3 (void *, int, struct rusage *);
int	nice (int);
int	killpg (int, int);
int	system (char *);


/*********************** low-level OS functions *********************/

int	ioctl (int, int, ...);
struct nlist;
int	nlist (const char *, struct nlist *);
int	munmap (void *, int);
int	brk (void *);
void *	sbrk (int);
struct rlimit;
int	getrlimit (int, struct rlimit *);
int	getpagesize (void);
int	shutdown (int, int);
int	mprotect (void *, int, int);

/*********************** miscellaneous functions *********************/

void	tputs (const char *cp, int affcnt, void (*)(int));
long	random (void);
int	srandom (int seed);

#endif /* __GNUC__ */

#endif /* INCLUDED_broken_sun_h_ */