merge emacs-23

3 files changed, 24 insertions, 6 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 55636cc9f40..b756aebe8a5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,20 @@
         * xfont.c (xfont_open): Fix setting of font->average_width from
         :avgwidth property (Bug#7123).
 
+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".
+        (Bug#7113)
+
 2010-09-26  Jan Djärv  <jan.h.d@swipnet.se>
 
         * xgselect.c (xg_select): Clear file descriptors not set from
diff --git a/src/dbusbind.c b/src/dbusbind.c
index f710741b591..f3a573d3bce 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -2130,8 +2130,12 @@ message arrives.  */);
     doc: /* If non-nil, debug messages of D-Bus bindings are raised.  */);
 #ifdef DBUS_DEBUG
   Vdbus_debug = Qt;
+  /* We can also set environment DBUS_VERBOSE=1 in order to see more
+     traces.  */
 #else
   Vdbus_debug = Qnil;
+  /* We do not want to abort.  */
+  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)
     {