diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2008-11-26 20:17:24 +0000 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2008-11-26 20:17:24 +0000 |
| commit | f7d20b3eac96b848904955fd0d3ca4867083772e (patch) | |
| tree | 6b570bac6ad35bfb583e1fee5ab434fb028c2efb /lisp | |
| parent | 7b66ce51f497e0ed2f1bb1a36a987bfcd8b54726 (diff) | |
| download | emacs-f7d20b3eac96b848904955fd0d3ca4867083772e.tar.gz | |
* net/dbus.el (dbus-handle-event): The result of a message call
can also be an object, which is not a consp.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/dbus.el | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f5772568c98..612c1b41bbb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2008-11-26 Michael Albinus <michael.albinus@gmx.de> + + * net/dbus.el (dbus-handle-event): The result of a message call + can also be an object, which is not a consp. + 2008-11-25 Alan Mackenzie <acm@muc.de> * emacs-lisp/lisp.el (forward-sexp, backward-sexp, mark-sexp) diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el index 5c7e719e305..13c2d39f6dd 100644 --- a/lisp/net/dbus.el +++ b/lisp/net/dbus.el @@ -362,7 +362,8 @@ If the HANDLER returns an `dbus-error', it is propagated as return message." (when (= dbus-message-type-method-call (nth 2 event)) (dbus-ignore-errors (apply 'dbus-method-return-internal - (nth 1 event) (nth 3 event) (nth 4 event) result)))) + (nth 1 event) (nth 3 event) (nth 4 event) + (if (consp result) result (list result)))))) ;; Error handling. (dbus-error ;; Return an error message when it is a message call. |