aboutsummaryrefslogtreecommitdiffstats
path: root/src/dbusbind.c
diff options
context:
space:
mode:
authorMichael R. Mauger2017-07-24 22:15:04 -0400
committerMichael R. Mauger2017-07-24 22:15:04 -0400
commitdf1a71272e5cdd10b511e2ffd702ca50ddd8a773 (patch)
tree9b9ac725394ee80891e2bff57b6407d0e491e71a /src/dbusbind.c
parenteb27fc4d49e8c914cd0e6a8a2d02159601542141 (diff)
parent32daa3cb54523006c88717cbeac87964cd687a1b (diff)
downloademacs-df1a71272e5cdd10b511e2ffd702ca50ddd8a773.tar.gz
emacs-df1a71272e5cdd10b511e2ffd702ca50ddd8a773.zip
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
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);