From d8a9588034119435beb1f5a005bdee7204093793 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Thu, 1 Oct 2020 10:32:50 +0200 Subject: [PATCH] Revert last change in dbusbind.c * src/dbusbind.c (XD_DBUS_TYPE_P, Fdbus__init_bus) (xd_read_queued_messages): Revert last change. (Bug#43724) --- src/dbusbind.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/dbusbind.c b/src/dbusbind.c index 36f86556944..54130be685c 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c @@ -211,7 +211,7 @@ xd_dbus_type_to_symbol (int type) /* Check whether a Lisp symbol is a predefined D-Bus type symbol. */ #define XD_DBUS_TYPE_P(object) \ - Fkeywordp (object) && ((xd_symbol_to_dbus_type (object) != DBUS_TYPE_INVALID)) + SYMBOLP (object) && ((xd_symbol_to_dbus_type (object) != DBUS_TYPE_INVALID)) /* Determine the DBusType of a given Lisp OBJECT. It is used to convert Lisp objects, being arguments of `dbus-call-method' or @@ -1231,7 +1231,7 @@ this connection to those buses. */) xd_add_watch, xd_remove_watch, xd_toggle_watch, - Fkeywordp (bus) + SYMBOLP (bus) ? (void *) XSYMBOL (bus) : (void *) XSTRING (bus), NULL)) @@ -1797,7 +1797,7 @@ xd_read_queued_messages (int fd, void *data) while (!NILP (busp)) { key = CAR_SAFE (CAR_SAFE (busp)); - if ((Fkeywordp (key) && XSYMBOL (key) == data) + if ((SYMBOLP (key) && XSYMBOL (key) == data) || (STRINGP (key) && XSTRING (key) == data)) bus = key; busp = CDR_SAFE (busp); -- 2.39.5