[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r116583: * dbusbind.c (Fdbus__init_bus, Qdbus__init_
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] trunk r116583: * dbusbind.c (Fdbus__init_bus, Qdbus__init_bus, Sdbus__init_bus): |
Date: |
Thu, 27 Feb 2014 15:36:18 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 116583
revision-id: address@hidden
parent: address@hidden
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Thu 2014-02-27 16:36:14 +0100
message:
* 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.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/dbusbind.c dbusbind.c-20091113204419-o5vbwnq5f7feedwu-7961
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-02-26 08:07:34 +0000
+++ b/src/ChangeLog 2014-02-27 15:36:14 +0000
@@ -1,3 +1,8 @@
+2014-02-27 Michael Albinus <address@hidden>
+
+ * 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 <address@hidden>
Fixes around Bug#16647.
=== modified file 'src/dbusbind.c'
--- a/src/dbusbind.c 2014-02-21 04:32:11 +0000
+++ b/src/dbusbind.c 2014-02-27 15:36:14 +0000
@@ -42,7 +42,7 @@
/* 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 @@
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 @@
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 @@
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);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r116583: * dbusbind.c (Fdbus__init_bus, Qdbus__init_bus, Sdbus__init_bus):,
Michael Albinus <=