mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-30 19:53:09 +00:00
Code Issues Releases Activity

* net/dbus.el (dbus-event-error-hooks): Fix docstring. Describe

Browse Source 
second parameter of hook functions.
(dbus-handle-event): Apply it.
This commit is contained in:
Michael Albinus 2009-01-28 16:10:38 +00:00
parent 74fc50477b
commit f213fc091d
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/ChangeLog
View File

@ -1,3 +1,9 @@
2009-01-28 Michael Albinus <michael.albinus@gmx.de>
* net/dbus.el (dbus-event-error-hooks): Fix docstring. Describe
second parameter of hook functions.
(dbus-handle-event): Apply it.
2009-01-28 Chong Yidong <cyd@stupidchicken.com>
* mail/rmail.el (rmail-toggle-header): Don't reset

4
lisp/net/dbus.el
View File

@ -99,7 +99,7 @@ Otherwise, return result of last form in BODY, or all other errors."
(defvar dbus-event-error-hooks nil
"Functions to be called when a D-Bus error happens in the event handler.
Every function must accept one argument, the error variable
Every function must accept two arguments, the event and the error variable
catched in `condition-case' by `dbus-error'.")
@ -379,7 +379,7 @@ If the HANDLER returns an `dbus-error', it is propagated as return message."
(dbus-method-error-internal
(nth 1 event) (nth 3 event) (nth 4 event) (cadr err))))
;; Propagate D-Bus error messages.
(run-hook-with-args 'dbus-event-error-hooks err)
(run-hook-with-args 'dbus-event-error-hooks event err)
(when (or dbus-debug (= dbus-message-type-error (nth 2 event)))
(signal (car err) (cdr err))))))