aboutsummaryrefslogtreecommitdiffstats
path: root/doc/misc
diff options
context:
space:
mode:
authorMichael Albinus2009-08-16 17:49:54 +0000
committerMichael Albinus2009-08-16 17:49:54 +0000
commit4f22e84d746e3614752d99f9638d1a55ac21e230 (patch)
treef3a8eb038dd3abdf3f61af4076268b4aeeab09aa /doc/misc
parentca4f31ea158896bcca9020b15489340df6ccba38 (diff)
downloademacs-4f22e84d746e3614752d99f9638d1a55ac21e230.tar.gz
emacs-4f22e84d746e3614752d99f9638d1a55ac21e230.zip
* dbus.texi (Asynchronous Methods): Allow nil handler.
Diffstat (limited to 'doc/misc')
-rw-r--r--doc/misc/ChangeLog10
-rw-r--r--doc/misc/dbus.texi11
2 files changed, 13 insertions, 8 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 6722fbd4705..a6b601ce0a3 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,9 +1,13 @@
12009-08-16 Michael Albinus <michael.albinus@gmx.de>
2
3 * dbus.texi (Asynchronous Methods): Allow nil handler.
4
12009-08-15 Michael Kifer <kifer@cs.stonybrook.edu> 52009-08-15 Michael Kifer <kifer@cs.stonybrook.edu>
2 6
3 * ediff.texi (ediff-current-file): added information about this new function. 7 * ediff.texi (ediff-current-file): added information about this new function.
4 8
5 * viper.text: Added information about C-s in viper's search command. 9 * viper.text: Added information about C-s in viper's search command.
6 10
72009-08-09 Colin Williams <lackita@gmail.com> (tiny change) 112009-08-09 Colin Williams <lackita@gmail.com> (tiny change)
8 12
9 * calc.texi (Date Forms): Fix typos. 13 * calc.texi (Date Forms): Fix typos.
diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi
index 3eb0076649d..1c9c66103eb 100644
--- a/doc/misc/dbus.texi
+++ b/doc/misc/dbus.texi
@@ -1189,7 +1189,8 @@ D-Bus object path, @var{service} is registered at. @var{interface} is
1189an interface offered by @var{service}. It must provide @var{method}. 1189an interface offered by @var{service}. It must provide @var{method}.
1190 1190
1191@var{handler} is a Lisp function, which is called when the 1191@var{handler} is a Lisp function, which is called when the
1192corresponding return message has arrived. 1192corresponding return message has arrived. If @var{handler} is
1193@code{nil}, no return message will be expected.
1193 1194
1194If the parameter @code{:timeout} is given, the following integer 1195If the parameter @code{:timeout} is given, the following integer
1195@var{timeout} specifies the maximum number of milliseconds a reply 1196@var{timeout} specifies the maximum number of milliseconds a reply
@@ -1201,10 +1202,10 @@ All other arguments args are passed to @var{method} as arguments.
1201They are converted into D-Bus types as described in @ref{Type 1202They are converted into D-Bus types as described in @ref{Type
1202Conversion}. 1203Conversion}.
1203 1204
1204The function returns a key into the hash table 1205Unless @var{handler} is @code{nil}, the function returns a key into
1205@code{dbus-registered-functions-table}. The corresponding entry in 1206the hash table @code{dbus-registered-functions-table}. The
1206the hash table is removed, when the return message has been arrived, 1207corresponding entry in the hash table is removed, when the return
1207and @var{handler} is called. Example: 1208message has been arrived, and @var{handler} is called. Example:
1208 1209
1209@lisp 1210@lisp
1210(dbus-call-method-asynchronously 1211(dbus-call-method-asynchronously