; Minor touchups to recent D-Bus changes

* doc/misc/dbus.texi (Receiving Method Calls): Use lowercase @var
names.
* lisp/net/dbus.el (dbus-register-method): Don't quote nil in
docstring.
(dbus-get-this-registered-property): Simplify double negation.

diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi
index c16b7aa91545a61dba68221c8774eb7a9bfc1043..a68cb26a3e53a7c15584e4368d554a10441c344f 100644 (file)
--- a/doc/misc/dbus.texi
+++ b/doc/misc/dbus.texi
@@ -1466,9 +1466,9 @@ If @var{handler} returns a reply message with an empty argument list,
 to distinguish it from @code{nil} (the boolean false).
 
 If @var{handler} detects an error, it shall return the list
-@code{(:error @var{ERROR-NAME} @var{ERROR-MESSAGE)}}.
-@var{ERROR-NAME} is a namespaced string which characterizes the error
-type, and @var{ERROR-MESSAGE} is a free text string.  Alternatively,
+@code{(:error @var{error-name} @var{error-message)}}.
+@var{error-name} is a namespaced string which characterizes the error
+type, and @var{error-message} is a free text string.  Alternatively,
 any Emacs signal @code{dbus-error} in @var{handler} raises a D-Bus
 error message with the error name @samp{org.freedesktop.DBus.Error.Failed}.
 

diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index 639b766d42660e08abbe1b098fcab8035f713b8f..ad5ff8d450e93934ccd19d1e993c6338cbd64522 100644 (file)
--- a/lisp/net/dbus.el
+++ b/lisp/net/dbus.el
@@ -802,7 +802,7 @@ received.  It must accept the input arguments of METHOD.  The
 return value of HANDLER is used for composing the returning D-Bus
 message.  If HANDLER returns a reply message with an empty
 argument list, HANDLER must return the symbol `:ignore' in order
-to distinguish it from `nil' (the boolean false).
+to distinguish it from nil (the boolean false).
 
 If HANDLER detects an error, it shall return the list `(:error
 ERROR-NAME ERROR-MESSAGE)'.  ERROR-NAME is a namespaced string
@@ -1459,9 +1459,9 @@ nil is returned."
   "Return PROPERTY entry of `dbus-registered-objects-table'.
 Filter out not matching PATH."
   ;; Remove entries not belonging to this case.
-  (seq-remove
+  (seq-filter
    (lambda (item)
-     (not (string-equal path (nth 2 item))))
+     (string-equal path (nth 2 item)))
    (gethash (list :property bus interface property)
             dbus-registered-objects-table)))