From: Michael Albinus <michael.albinus@gmx.de>
Date: Sat, 22 Dec 2007 14:59:24 +0000 (+0000)
Subject: * dbus.texi (Type Conversion): Correct input parameters mapping.
X-Git-Tag: emacs-pretest-23.0.90~8864
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d4e67bc5cb816ea8cfbe75e6cb601a920a7fec99;p=emacs.git

* dbus.texi (Type Conversion): Correct input parameters mapping.
---

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 67ca3866e7d..69b54a0bea5 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-22  Michael Albinus  <michael.albinus@gmx.de>
+
+	* dbus.texi (Type Conversion): Correct input parameters mapping.
+
 2007-12-21  Michael Albinus  <michael.albinus@gmx.de>
 
 	* dbus.texi (Type Conversion): Extend for D-Bus compound types.
diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi
index 7f4d0f7243b..352e57f0faa 100644
--- a/doc/misc/dbus.texi
+++ b/doc/misc/dbus.texi
@@ -268,9 +268,10 @@ input parameter.
 
 If it is necessary to use another D-Bus type, a corresponding type
 symbol can be preceeded to the corresponding Lisp object. Basic D-Bus
-types are represented by the type symbols `:byte', `:boolean',
-`:int16', `:uint16', `:int32', `:uint32', `:int64', `:uint64',
-`:double', `:string', `:object-path' and `:signature'.
+types are represented by the type symbols @code{:byte},
+@code{:boolean}, @code{:int16}, @code{:uint16}, @code{:int32},
+@code{:uint32}, @code{:int64}, @code{:uint64}, @code{:double},
+@code{:string}, @code{:object-path} and @code{:signature}.
 
 @noindent
 Example:
@@ -292,10 +293,10 @@ but different to
 @end lisp
 
 A D-Bus compound type is always represented as list.  The car of this
-list can be the type symbol `:array', `:variant', `:struct' or
-`:dict-entry', which would result in a corresponding D-Bus container.
-`:array' is optional, because this is the default compoud type for a
-list.
+list can be the type symbol @code{:array}, @code{:variant},
+@code{:struct} or @code{:dict-entry}, which would result in a
+corresponding D-Bus container.  @code{:array} is optional, because
+this is the default compoud type for a list.
 
 The objects being elements of the list are checked according to the
 D-Bus compound type rules.
@@ -332,13 +333,13 @@ objects.
 @item D-Bus type            @tab              @tab Lisp type
 @item
 @item DBUS_TYPE_BOOLEAN     @tab @expansion{} @tab @code{t} or @code{nil}
-@item DBUS_TYPE_BYTE        @tab @expansion{} @tab
+@item DBUS_TYPE_BYTE        @tab @expansion{} @tab number
 @item DBUS_TYPE_UINT16      @tab @expansion{} @tab number
-@item DBUS_TYPE_INT32       @tab @expansion{} @tab number
-@item DBUS_TYPE_UINT32      @tab @expansion{} @tab number
-@item DBUS_TYPE_INT32       @tab @expansion{} @tab number
-@item DBUS_TYPE_UINT64      @tab @expansion{} @tab number
-@item DBUS_TYPE_INT64       @tab @expansion{} @tab number
+@item DBUS_TYPE_INT16       @tab @expansion{} @tab number
+@item DBUS_TYPE_UINT32      @tab @expansion{} @tab number or float
+@item DBUS_TYPE_INT32       @tab @expansion{} @tab number or float
+@item DBUS_TYPE_UINT64      @tab @expansion{} @tab number or float
+@item DBUS_TYPE_INT64       @tab @expansion{} @tab number or float
 @item DBUS_TYPE_DOUBLE      @tab @expansion{} @tab float
 @item DBUS_TYPE_STRING      @tab @expansion{} @tab string
 @item DBUS_TYPE_OBJECT_PATH @tab @expansion{} @tab string
@@ -350,6 +351,11 @@ objects.
 @end multitable
 @end example
 
+A float object in case of @code{DBUS_TYPE_UINT32},
+@code{DBUS_TYPE_INT32}, @code{DBUS_TYPE_UINT64} and
+@code{DBUS_TYPE_INT6432} is returned, when the C value exceeds the
+Emacs number size range.
+
 The resulting list of the last 4 D-Bus compound types contains as
 elements the elements of the D-Bus container, mapped according to the
 same rules.