# HG changeset patch
# User Michael Albinus <michael.albinus@gmx.de>
# Date 1285681162 -7200
# Node ID 56cf47a21830e1127e684ff231e83e6b1e89c4fe
# Parent  8d679bf1ecf17eae2700b4c97dd73044b82f2a59
* dbusbind.c (syms_of_dbusbind): Use putenv instead of setenv, it
is more portable.

* keyboard.c (gobble_input): Move call of xd_read_queued_messages ...
(kbd_buffer_get_event): ... here. This is needed for cygwin, which
has not defined SIGIO.

diff -r 8d679bf1ecf1 -r 56cf47a21830 src/ChangeLog
--- a/src/ChangeLog	Tue Sep 28 01:41:00 2010 +0200
+++ b/src/ChangeLog	Tue Sep 28 15:39:22 2010 +0200
@@ -1,3 +1,12 @@
+2010-09-28  Michael Albinus  <michael.albinus@gmx.de>
+
+	* dbusbind.c (syms_of_dbusbind): Use putenv instead of setenv, it
+	is more portable.
+
+	* keyboard.c (gobble_input): Move call of xd_read_queued_messages ...
+	(kbd_buffer_get_event): ... here. This is needed for cygwin, which
+	has not defined SIGIO.
+
 2010-09-27  Michael Albinus  <michael.albinus@gmx.de>
 
 	* dbusbind.c (syms_of_dbusbind): Set $DBUS_FATAL_WARNINGS to "0".
diff -r 8d679bf1ecf1 -r 56cf47a21830 src/dbusbind.c
--- a/src/dbusbind.c	Tue Sep 28 01:41:00 2010 +0200
+++ b/src/dbusbind.c	Tue Sep 28 15:39:22 2010 +0200
@@ -2135,7 +2135,7 @@
 #else
   Vdbus_debug = Qnil;
   /* We do not want to abort.  */
-  setenv ("DBUS_FATAL_WARNINGS", "0", 1);
+  putenv ("DBUS_FATAL_WARNINGS=0");
 #endif
 
   Fprovide (intern_c_string ("dbusbind"), Qnil);
diff -r 8d679bf1ecf1 -r 56cf47a21830 src/keyboard.c
--- a/src/keyboard.c	Tue Sep 28 01:41:00 2010 +0200
+++ b/src/keyboard.c	Tue Sep 28 15:39:22 2010 +0200
@@ -4106,6 +4106,11 @@
       /* One way or another, wait until input is available; then, if
 	 interrupt handlers have not read it, read it now.  */
 
+#ifdef HAVE_DBUS
+      /* Read D-Bus messages.  */
+      xd_read_queued_messages ();
+#endif /* HAVE_DBUS */
+
 /* Note SIGIO has been undef'd if FIONREAD is missing.  */
 #ifdef SIGIO
       gobble_input (0);
@@ -4757,7 +4762,7 @@
 {
   EMACS_TIME nexttime;
 
-  do 
+  do
     {
       nexttime = timer_check_2 ();
     }
@@ -7051,11 +7056,6 @@
 gobble_input (expected)
      int expected;
 {
-#ifdef HAVE_DBUS
-  /* Read D-Bus messages.  */
-  xd_read_queued_messages ();
-#endif /* HAVE_DBUS */
-
 #ifdef SIGIO
   if (interrupt_input)
     {