[Emacs-diffs] /srv/bzr/emacs/trunk r107164: * notifications.el (notifications-on-closed-signal): Make `reason'

[Michael Albinus]

------------------------------------------------------------
revno: 107164
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Tue 2012-02-07 10:06:19 +0100
message:
  * notifications.el (notifications-on-closed-signal): Make `reason'
    optional.  (Bug#10744)
modified:
  lisp/ChangeLog
  lisp/notifications.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-02-07 08:26:54 +0000
+++ b/lisp/ChangeLog    2012-02-07 09:06:19 +0000
@@ -1,3 +1,8 @@
+2012-02-07  Michael Albinus  <address@hidden>
+
+       * notifications.el (notifications-on-closed-signal): Make `reason'
+       optional.  (Bug#10744)
+
 2012-02-07  Glenn Morris  <address@hidden>
 
        * emacs-lisp/easy-mmode.el (define-minor-mode):

=== modified file 'lisp/notifications.el'
--- a/lisp/notifications.el     2012-01-05 09:46:05 +0000
+++ b/lisp/notifications.el     2012-02-07 09:06:19 +0000
@@ -107,9 +107,12 @@
    notifications-action-signal
    'notifications-on-action-signal))
 
-(defun notifications-on-closed-signal (id reason)
+(defun notifications-on-closed-signal (id &optional reason)
   "Dispatch signals to callback functions from `notifications-on-closed-map'."
-  (let ((entry (assoc id notifications-on-close-map)))
+  ;; notification-daemon prior 0.4.0 does not send a reason.  So we
+  ;; make it optional, and assume `undefined' as default.
+  (let ((entry (assoc id notifications-on-close-map))
+       (reason (or reason 4)))
     (when entry
       (funcall (cadr entry)
               id (cadr (assoc reason notifications-closed-reason)))