mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-26 07:33:47 +00:00
Code Issues Releases Activity

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

Browse Source 
Rename from Fdbus_init_bus_1, Qdbus_init_bus_1, Sdbus_init_bus_1.
This commit is contained in:
Michael Albinus 2014-02-27 16:36:14 +01:00
parent 298520dfb7
commit d8c25f59d6
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
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> 2014-02-26 Martin Rudalics <rudalics@gmx.at>
Fixes around Bug#16647. Fixes around Bug#16647.

14
src/dbusbind.c
View File

@ -42,7 +42,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Subroutines. */ /* 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_get_unique_name;
static Lisp_Object Qdbus_message_internal; static Lisp_Object Qdbus_message_internal;
@ -1094,7 +1094,7 @@ xd_close_bus (Lisp_Object bus)
if (NILP (val)) if (NILP (val))
return; return;
busobj = CDR_SAFE(val); busobj = CDR_SAFE (val);
if (NILP (busobj)) { if (NILP (busobj)) {
xd_registered_buses = Fdelete (val, xd_registered_buses); xd_registered_buses = Fdelete (val, xd_registered_buses);
return; return;
@ -1121,11 +1121,11 @@ xd_close_bus (Lisp_Object bus)
return; 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. doc: /* Establish the connection to D-Bus BUS.
This function is dbus-internal. You almost certainly want to use This function is dbus internal. You almost certainly want to use
dbus-init-bus. `dbus-init-bus'.
BUS can be either the symbol `:system' or the symbol `:session', or it 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 can be a string denoting the address of the corresponding bus. For
@ -1745,8 +1745,8 @@ void
syms_of_dbusbind (void) syms_of_dbusbind (void)
{ {
DEFSYM (Qdbus_init_bus_1, "dbus-init-bus-1"); DEFSYM (Qdbus__init_bus, "dbus--init-bus");
defsubr (&Sdbus_init_bus_1); defsubr (&Sdbus__init_bus);
DEFSYM (Qdbus_get_unique_name, "dbus-get-unique-name"); DEFSYM (Qdbus_get_unique_name, "dbus-get-unique-name");
defsubr (&Sdbus_get_unique_name); defsubr (&Sdbus_get_unique_name);