* 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.

diff --git a/src/ChangeLog b/src/ChangeLog
index 0c0d5964742e475d7fb55c8b57fe5c58196136c5..88458de6b01fbb5e2a297e1611b271fdb6462ea5 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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>
 
        Fixes around Bug#16647.

diff --git a/src/dbusbind.c b/src/dbusbind.c
index 460733c7239dffe491952a2fb5cd799856b8bfda..8ebc56c72c4bf5fb11504759007a7d30a52b683a 100644 (file)
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -42,7 +42,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 \f
 /* 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);