--- xgselect.c.orig	2012-05-15 13:53:13.000000000 -0400
+++ xgselect.c	2012-05-15 14:09:19.093750000 -0400
@@ -35,6 +35,9 @@
 xg_select (int max_fds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds,
 	   EMACS_TIME *timeout)
 {
+  if (inhibit_window_system || !display_arg)
+    return select (max_fds, rfds, wfds, efds, timeout);
+
   SELECT_TYPE all_rfds, all_wfds;
   EMACS_TIME tmo, *tmop = timeout;