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

second parameter of hook functions.
(dbus-handle-event): Apply it.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 60f20963818e736448e7b3f7c58b27bb0d1e8011..9da3daaebc43862e83eb69f285d582655433263f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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

diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index 39247b0b62d4e141cb5ef2ee29d119c7fa9a5629..f586a4125debf3aa590d3097c5f0466ebbccedbf 100644 (file)
--- 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'.")
 
 \f
@@ -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))))))