procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert last change in dbusbind.c

Browse source 
* src/dbusbind.c (XD_DBUS_TYPE_P, Fdbus__init_bus)
(xd_read_queued_messages): Revert last change.  (Bug#43724)
This commit is contained in:
Michael Albinus 2020-10-01 10:32:50 +02:00
parent 648de09e71
commit d8a9588034
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/dbusbind.c
View file

@ -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);