Commit d8c25f59 authored by Michael Albinus's avatar Michael Albinus
Browse files

* dbusbind.c (Fdbus__init_bus, Qdbus__init_bus, Sdbus__init_bus):

Rename from Fdbus_init_bus_1, Qdbus_init_bus_1, Sdbus_init_bus_1.
parent 298520df
2014-02-27 Michael Albinus <michael.albinus@gmx.de>
* dbusbind.c (Fdbus__init_bus, Qdbus__init_bus, Sdbus__init_bus):
Rename from Fdbus_init_bus_1, Qdbus_init_bus_1, Sdbus_init_bus_1.
2014-02-26 Martin Rudalics <rudalics@gmx.at>
Fixes around Bug#16647.
......
......@@ -42,7 +42,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Subroutines. */
static Lisp_Object Qdbus_init_bus_1;
static Lisp_Object Qdbus__init_bus;
static Lisp_Object Qdbus_get_unique_name;
static Lisp_Object Qdbus_message_internal;
......@@ -1094,7 +1094,7 @@ xd_close_bus (Lisp_Object bus)
if (NILP (val))
return;
busobj = CDR_SAFE(val);
busobj = CDR_SAFE (val);
if (NILP (busobj)) {
xd_registered_buses = Fdelete (val, xd_registered_buses);
return;
......@@ -1121,11 +1121,11 @@ xd_close_bus (Lisp_Object bus)
return;
}
DEFUN ("dbus-init-bus-1", Fdbus_init_bus_1, Sdbus_init_bus_1, 1, 2, 0,
DEFUN ("dbus--init-bus", Fdbus__init_bus, Sdbus__init_bus, 1, 2, 0,
doc: /* Establish the connection to D-Bus BUS.
This function is dbus-internal. You almost certainly want to use
dbus-init-bus.
This function is dbus internal. You almost certainly want to use
`dbus-init-bus'.
BUS can be either the symbol `:system' or the symbol `:session', or it
can be a string denoting the address of the corresponding bus. For
......@@ -1745,8 +1745,8 @@ void
syms_of_dbusbind (void)
{
DEFSYM (Qdbus_init_bus_1, "dbus-init-bus-1");
defsubr (&Sdbus_init_bus_1);
DEFSYM (Qdbus__init_bus, "dbus--init-bus");
defsubr (&Sdbus__init_bus);
DEFSYM (Qdbus_get_unique_name, "dbus-get-unique-name");
defsubr (&Sdbus_get_unique_name);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment