1 *** emacs-23.4.orig/src/lisp.h	Wed Jan 11 05:35:01 2012

     2 --- emacs-23.4/src/lisp.h	Fri Feb  1 11:12:55 2013

     3 ***************

     4 *** 3435,3440 ****

     5 --- 3435,3441 ----

     6   #ifdef HAVE_X_WINDOWS

     7   /* Defined in xfns.c */

     8   extern void syms_of_xfns P_ ((void));

     9 + extern int x_in_use;

    10   

    11   /* Defined in xsmfns.c */

    12   extern void syms_of_xsmfns P_ ((void));

    13 *** emacs-23.4.orig/src/xfns.c	Wed Jan 11 05:35:01 2012

    14 --- emacs-23.4/src/xfns.c	Fri Feb  1 11:13:27 2013

    15 ***************

    16 *** 183,189 ****

    17   

    18   /* Nonzero if using X.  */

    19   

    20 ! static int x_in_use;

    21   

    22   /* Non nil if no window manager is in use.  */

    23   

    24 --- 183,189 ----

    25   

    26   /* Nonzero if using X.  */

    27   

    28 ! int x_in_use;

    29   

    30   /* Non nil if no window manager is in use.  */

    31   

    32 *** emacs-23.4.orig/src/xgselect.c	Wed Jan 11 05:35:01 2012

    33 --- emacs-23.4/src/xgselect.c	Fri Feb  1 11:13:54 2013

    34 ***************

    35 *** 44,49 ****

    36 --- 44,52 ----

    37     int n_gfds = 0, our_tmo = 0, retval = 0, our_fds = 0;

    38     int prio, i, nfds, tmo_in_millisec;

    39   

    40 +   if (!x_in_use)

    41 +     return select (max_fds, rfds, wfds, efds, timeout);

    42 + 

    43     if (rfds) memcpy (&all_rfds, rfds, sizeof (all_rfds));

    44     else FD_ZERO (&all_rfds);

    45     if (wfds) memcpy (&all_wfds, wfds, sizeof (all_rfds));