From cb87eeff1bf88d9d1849c452e8b9953b06ada454 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Fri, 5 Mar 2021 17:51:22 +0100 Subject: Declare some completion predicates * lisp/filenotify.el (file-notify-handle-event): * lisp/net/dbus.el (dbus-handle-event): Declare `completion-predicate'. --- lisp/net/dbus.el | 1 + 1 file changed, 1 insertion(+) (limited to 'lisp/net/dbus.el') diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el index a9de35c814f..1e7f836d820 100644 --- a/lisp/net/dbus.el +++ b/lisp/net/dbus.el @@ -1144,6 +1144,7 @@ compound type arguments (TYPE VALUE) will be kept as is." EVENT is a D-Bus event, see `dbus-check-event'. HANDLER, being part of the event, is called with arguments ARGS (without type information). If the HANDLER returns a `dbus-error', it is propagated as return message." + (declare (completion ignore)) (interactive "e") (condition-case err (let (monitor args result) -- cgit v1.2.3 From ee3a4e3d1be656cd0df71ed197dc5f102556f0e0 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Sun, 28 Mar 2021 19:22:15 +0200 Subject: Fix a dbus.el byte compilation warning * lisp/net/dbus.el (dbus-register-monitor): Silence a byte-compilation warning on systems without dbus. --- lisp/net/dbus.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lisp/net/dbus.el') diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el index 1e7f836d820..4116d293e1b 100644 --- a/lisp/net/dbus.el +++ b/lisp/net/dbus.el @@ -2029,8 +2029,9 @@ either a method name, a signal name, or an error name." ",") rule (or rule "")) - (unless (ignore-errors (dbus-get-unique-name bus-private)) - (dbus-init-bus bus 'private)) + (when (fboundp 'dbus-get-unique-name) + (unless (ignore-errors (dbus-get-unique-name bus-private)) + (dbus-init-bus bus 'private))) (dbus-call-method bus-private dbus-service-dbus dbus-path-dbus dbus-interface-monitoring "BecomeMonitor" `(:array :string ,rule) :uint32 0) -- cgit v1.2.3