summaryrefslogtreecommitdiff
path: root/lisp/net/dbus.el
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2018-04-06 11:49:21 +0200
committerMichael Albinus <michael.albinus@gmx.de>2018-04-06 11:49:21 +0200
commit358da4565b589570759ddc9c2d1043405fdbb26e (patch)
tree37d7cad51bcc7f0373d90169f0f0be00ff151092 /lisp/net/dbus.el
parent10ef466a9eb621a3752de69930fcb14bf1af4887 (diff)
downloademacs-358da4565b589570759ddc9c2d1043405fdbb26e.tar.gz
Make dbus.el fitter for Emacs configured --without-dbus
* lisp/net/dbus.el (dbus-error, dbus-debug): Define if not exist. * test/lisp/net/secrets-tests.el: Revert 51c8369fa2 and 79a3ad9592.
Diffstat (limited to 'lisp/net/dbus.el')
-rw-r--r--lisp/net/dbus.el9
1 files changed, 8 insertions, 1 deletions
diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index f63ab9a15a8..2d9660d127f 100644
--- a/lisp/net/dbus.el
+++ b/lisp/net/dbus.el
@@ -41,9 +41,16 @@
(defvar dbus-message-type-method-return)
(defvar dbus-message-type-error)
(defvar dbus-message-type-signal)
-(defvar dbus-debug)
(defvar dbus-registered-objects-table)
+;; The following symbols are defined in dbusbind.c. We need them also
+;; when Emacs is compiled without D-Bus support.
+(unless (boundp 'dbus-error)
+ (define-error 'dbus-error "D-Bus error"))
+
+(unless (boundp 'dbus-debug)
+ (defvar dbus-debug nil))
+
;; Pacify byte compiler.
(eval-when-compile (require 'cl-lib))