aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2010-11-10 09:41:53 +0100
committerMichael Albinus2010-11-10 09:41:53 +0100
commit6f8fc60c41b69cfbf1ff4340978ca3a9ce43e551 (patch)
tree9ea81aa29a48829cc2d89061003c9264b95c0401
parent6d2a1e35669ce4e2442f1df065ed77f833af532c (diff)
downloademacs-6f8fc60c41b69cfbf1ff4340978ca3a9ce43e551.tar.gz
emacs-6f8fc60c41b69cfbf1ff4340978ca3a9ce43e551.zip
* dbus.texi (Type Conversion): Introduce `:unix-fd' type mapping.
-rw-r--r--doc/misc/ChangeLog4
-rw-r--r--doc/misc/dbus.texi10
2 files changed, 10 insertions, 4 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 0d1d0e2cc2e..1ecdd8fd777 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
12010-11-10 Michael Albinus <michael.albinus@gmx.de>
2
3 * dbus.texi (Type Conversion): Introduce `:unix-fd' type mapping.
4
12010-11-09 Lars Magne Ingebrigtsen <larsi@gnus.org> 52010-11-09 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 6
3 * gnus.texi (Article Washing): Document gnus-article-treat-non-ascii. 7 * gnus.texi (Article Washing): Document gnus-article-treat-non-ascii.
diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi
index f4f96d55391..6f6a897e6dc 100644
--- a/doc/misc/dbus.texi
+++ b/doc/misc/dbus.texi
@@ -890,7 +890,8 @@ symbol can be preceeded to the corresponding Lisp object. Basic D-Bus
890types are represented by the type symbols @code{:byte}, 890types are represented by the type symbols @code{:byte},
891@code{:boolean}, @code{:int16}, @code{:uint16}, @code{:int32}, 891@code{:boolean}, @code{:int16}, @code{:uint16}, @code{:int32},
892@code{:uint32}, @code{:int64}, @code{:uint64}, @code{:double}, 892@code{:uint32}, @code{:int64}, @code{:uint64}, @code{:double},
893@code{:string}, @code{:object-path} and @code{:signature}. 893@code{:string}, @code{:object-path}, @code{:signature} and
894@code{:unix-fd}.
894 895
895@noindent 896@noindent
896Example: 897Example:
@@ -1009,6 +1010,7 @@ objects.
1009@item DBUS_TYPE_UINT16 @tab @expansion{} @tab natural number 1010@item DBUS_TYPE_UINT16 @tab @expansion{} @tab natural number
1010@item DBUS_TYPE_INT16 @tab @expansion{} @tab integer 1011@item DBUS_TYPE_INT16 @tab @expansion{} @tab integer
1011@item DBUS_TYPE_UINT32 @tab @expansion{} @tab natural number or float 1012@item DBUS_TYPE_UINT32 @tab @expansion{} @tab natural number or float
1013@item DBUS_TYPE_UNIX_FD @tab @expansion{} @tab natural number or float
1012@item DBUS_TYPE_INT32 @tab @expansion{} @tab integer or float 1014@item DBUS_TYPE_INT32 @tab @expansion{} @tab integer or float
1013@item DBUS_TYPE_UINT64 @tab @expansion{} @tab natural number or float 1015@item DBUS_TYPE_UINT64 @tab @expansion{} @tab natural number or float
1014@item DBUS_TYPE_INT64 @tab @expansion{} @tab integer or float 1016@item DBUS_TYPE_INT64 @tab @expansion{} @tab integer or float
@@ -1024,9 +1026,9 @@ objects.
1024@end example 1026@end example
1025 1027
1026A float object in case of @code{DBUS_TYPE_UINT32}, 1028A float object in case of @code{DBUS_TYPE_UINT32},
1027@code{DBUS_TYPE_INT32}, @code{DBUS_TYPE_UINT64} and 1029@code{DBUS_TYPE_INT32}, @code{DBUS_TYPE_UINT64},
1028@code{DBUS_TYPE_INT6432} is returned, when the C value exceeds the 1030@code{DBUS_TYPE_INT64} and @code{DBUS_TYPE_UNIX_FD} is returned, when
1029Emacs number size range. 1031the C value exceeds the Emacs number size range.
1030 1032
1031The resulting list of the last 4 D-Bus compound types contains as 1033The resulting list of the last 4 D-Bus compound types contains as
1032elements the elements of the D-Bus container, mapped according to the 1034elements the elements of the D-Bus container, mapped according to the