2 files changed, 7 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 435c09f0ff8..380e8becc1f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-27  Michael Albinus  <michael.albinus@gmx.de>
+
+        * dbusbind.c (syms_of_dbusbind): Unset $DBUS_FATAL_WARNINGS.
+        (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..6fc5a923422 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -2132,6 +2132,8 @@ message arrives.  */);
   Vdbus_debug = Qt;
 #else
   Vdbus_debug = Qnil;
+  /* We do not want to abort.  */
+  unsetenv ("DBUS_FATAL_WARNINGS");
 #endif
 
   Fprovide (intern_c_string ("dbusbind"), Qnil);