aboutsummaryrefslogtreecommitdiffstats
path: root/src/dbusbind.c
diff options
context:
space:
mode:
authorNicolas Petton2017-07-07 21:21:55 +0200
committerNicolas Petton2017-07-11 10:07:16 +0200
commit0bece6c6815cc59e181817a2765a4ea752f34f56 (patch)
tree856363b2defed20c97a25c29a7739bce9a6bd9cb /src/dbusbind.c
parent689c5c20d1174e95be50e674d05632545eb4b9c5 (diff)
downloademacs-0bece6c6815cc59e181817a2765a4ea752f34f56.tar.gz
emacs-0bece6c6815cc59e181817a2765a4ea752f34f56.zip
Add an optional testfn parameter to assoc
* src/fns.c (assoc): New optional testfn parameter used for comparison when provided. * test/src/fns-tests.el (test-assoc-testfn): Add tests for the new 'testfn' parameter. * src/buffer.c: * src/coding.c: * src/dbusbind.c: * src/font.c: * src/fontset.c: * src/gfilenotify.c: * src/image.c: * src/keymap.c: * src/process.c: * src/w32fns.c: * src/w32font.c: * src/w32notify.c: * src/w32term.c: * src/xdisp.c: * src/xfont.c: Add a third argument to Fassoc calls. * etc/NEWS: * doc/lispref/lists.texi: Document the new 'testfn' parameter.
Diffstat (limited to 'src/dbusbind.c')
-rw-r--r--src/dbusbind.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dbusbind.c b/src/dbusbind.c
index d2460fd886e..0d9d3e514fd 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -955,7 +955,7 @@ xd_get_connection_address (Lisp_Object bus)
955 DBusConnection *connection; 955 DBusConnection *connection;
956 Lisp_Object val; 956 Lisp_Object val;
957 957
958 val = CDR_SAFE (Fassoc (bus, xd_registered_buses)); 958 val = CDR_SAFE (Fassoc (bus, xd_registered_buses, Qnil));
959 if (NILP (val)) 959 if (NILP (val))
960 XD_SIGNAL2 (build_string ("No connection to bus"), bus); 960 XD_SIGNAL2 (build_string ("No connection to bus"), bus);
961 else 961 else
@@ -1057,7 +1057,7 @@ xd_close_bus (Lisp_Object bus)
1057 Lisp_Object busobj; 1057 Lisp_Object busobj;
1058 1058
1059 /* Check whether we are connected. */ 1059 /* Check whether we are connected. */
1060 val = Fassoc (bus, xd_registered_buses); 1060 val = Fassoc (bus, xd_registered_buses, Qnil);
1061 if (NILP (val)) 1061 if (NILP (val))
1062 return; 1062 return;
1063 1063
@@ -1127,7 +1127,7 @@ this connection to those buses. */)
1127 xd_close_bus (bus); 1127 xd_close_bus (bus);
1128 1128
1129 /* Check, whether we are still connected. */ 1129 /* Check, whether we are still connected. */
1130 val = Fassoc (bus, xd_registered_buses); 1130 val = Fassoc (bus, xd_registered_buses, Qnil);
1131 if (!NILP (val)) 1131 if (!NILP (val))
1132 { 1132 {
1133 connection = xd_get_connection_address (bus); 1133 connection = xd_get_connection_address (bus);