From f213fc091d1a93eb0606786670ae67f89a1129cf Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Wed, 28 Jan 2009 16:10:38 +0000 Subject: [PATCH] * net/dbus.el (dbus-event-error-hooks): Fix docstring. Describe second parameter of hook functions. (dbus-handle-event): Apply it. --- lisp/ChangeLog | 6 ++++++ lisp/net/dbus.el | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 60f20963818..9da3daaebc4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2009-01-28 Michael Albinus + + * 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 * mail/rmail.el (rmail-toggle-header): Don't reset diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el index 39247b0b62d..f586a4125de 100644 --- a/lisp/net/dbus.el +++ b/lisp/net/dbus.el @@ -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)))))) -- 2.39.5