From: Michael Albinus <michael.albinus@gmx.de>
Date: Tue, 28 Sep 2010 13:39:22 +0000 (+0200)
Subject: * dbusbind.c (syms_of_dbusbind): Use putenv instead of setenv, it
X-Git-Tag: emacs-pretest-23.2.90~93^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dec834684640a6495b39bf11e500d326b4ff193b;p=emacs.git

* 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 --git a/src/ChangeLog b/src/ChangeLog
index c74dd66edbb..9a5043cf65c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/dbusbind.c b/src/dbusbind.c
index 93887fa9902..f3a573d3bce 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -2135,7 +2135,7 @@ message arrives.  */);
 #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 --git a/src/keyboard.c b/src/keyboard.c
index 056e379a44a..22c58985a56 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -4106,6 +4106,11 @@ kbd_buffer_get_event (kbp, used_mouse_menu, end_time)
       /* 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 @@ timer_check (do_it_now)
 {
   EMACS_TIME nexttime;
 
-  do 
+  do
     {
       nexttime = timer_check_2 ();
     }
@@ -7051,11 +7056,6 @@ void
 gobble_input (expected)
      int expected;
 {
-#ifdef HAVE_DBUS
-  /* Read D-Bus messages.  */
-  xd_read_queued_messages ();
-#endif /* HAVE_DBUS */
-
 #ifdef SIGIO
   if (interrupt_input)
     {