aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Albinus2010-09-27 10:59:16 +0200
committerMichael Albinus2010-09-27 10:59:16 +0200
commite0720500f63c0fc2224dda81d02970583dea135c (patch)
treecc24e63f517398390177745faa8814bc24503d5a /src
parentfd057fd25e400a18cc83ba17ce487c760a78f18d (diff)
downloademacs-e0720500f63c0fc2224dda81d02970583dea135c.tar.gz
emacs-e0720500f63c0fc2224dda81d02970583dea135c.zip
* dbusbind.c (syms_of_dbusbind): Unset $DBUS_FATAL_WARNINGS.
(Bug#7113)
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/dbusbind.c2
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 @@
12010-09-27 Michael Albinus <michael.albinus@gmx.de>
2
3 * dbusbind.c (syms_of_dbusbind): Unset $DBUS_FATAL_WARNINGS.
4 (Bug#7113)
5
12010-09-26 Jan Djärv <jan.h.d@swipnet.se> 62010-09-26 Jan Djärv <jan.h.d@swipnet.se>
2 7
3 * xgselect.c (xg_select): Clear file descriptors not set from 8 * 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. */);
2132 Vdbus_debug = Qt; 2132 Vdbus_debug = Qt;
2133#else 2133#else
2134 Vdbus_debug = Qnil; 2134 Vdbus_debug = Qnil;
2135 /* We do not want to abort. */
2136 unsetenv ("DBUS_FATAL_WARNINGS");
2135#endif 2137#endif
2136 2138
2137 Fprovide (intern_c_string ("dbusbind"), Qnil); 2139 Fprovide (intern_c_string ("dbusbind"), Qnil);