From: Michael Albinus Date: Tue, 7 Feb 2012 09:06:19 +0000 (+0100) Subject: * notifications.el (notifications-on-closed-signal): Make `reason' X-Git-Tag: emacs-pretest-24.0.94~257 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5b77774d024ce0c13b1b071b447a344fe5c70bd7;p=emacs.git * notifications.el (notifications-on-closed-signal): Make `reason' optional. (Bug#10744) --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f69b94fdb7b..e04126bf4ee 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-02-07 Michael Albinus + + * notifications.el (notifications-on-closed-signal): Make `reason' + optional. (Bug#10744) + 2012-02-07 Glenn Morris * emacs-lisp/easy-mmode.el (define-minor-mode): diff --git a/lisp/notifications.el b/lisp/notifications.el index c3b6c759506..9f7576b3f5d 100644 --- a/lisp/notifications.el +++ b/lisp/notifications.el @@ -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)))