Mercurial > emacs

comparison src/dbusbind.c @ 110627:6a7fb61524be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge changes from emacs-23 branch.
author Juanma Barranquero <lekktu@gmail.com>
date Tue, 28 Sep 2010 01:25:27 +0200
parents 7867879a43ce cf68fbaebcfe
children 55c8c3ca3d48
comparison
equal deleted inserted replaced
110615:84a76c5e1b1c 110627:6a7fb61524be
2159 2159
2160 DEFVAR_LISP ("dbus-debug", &Vdbus_debug, 2160 DEFVAR_LISP ("dbus-debug", &Vdbus_debug,
2161 doc: /* If non-nil, debug messages of D-Bus bindings are raised. */); 2161 doc: /* If non-nil, debug messages of D-Bus bindings are raised. */);
2162 #ifdef DBUS_DEBUG 2162 #ifdef DBUS_DEBUG
2163 Vdbus_debug = Qt; 2163 Vdbus_debug = Qt;
2164 /* We can also set environment DBUS_VERBOSE=1 in order to see more
2165 traces. */
2164 #else 2166 #else
2165 Vdbus_debug = Qnil; 2167 Vdbus_debug = Qnil;
2168 /* We do not want to abort. */
2169 setenv ("DBUS_FATAL_WARNINGS", "0", 1);
2166 #endif 2170 #endif
2167 2171
2168 Fprovide (intern_c_string ("dbusbind"), Qnil); 2172 Fprovide (intern_c_string ("dbusbind"), Qnil);
2169 2173
2170 } 2174 }