mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-04 08:47:11 +00:00
Code Issues Releases Activity

* net/dbus.el (dbus-handle-event): The result of a message call

Browse Source 
can also be an object, which is not a consp.
This commit is contained in:
Michael Albinus 2008-11-26 20:17:24 +00:00
parent 7b66ce51f4
commit f7d20b3eac
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -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)

3
lisp/net/dbus.el
View File

@ -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.