From 1e731ceaa0ca9156d281fca77251a19651b5aac0 Mon Sep 17 00:00:00 2001 From: Rasmus Date: Thu, 1 Oct 2020 12:36:21 +0200 Subject: [PATCH] * gnus-icalendar.el: Fix bug in gnus-icalendar-identities `gnus-ignored-from-addresses' and `message-alternative-emails' may be functions. This is not supported by `gnus-icalendar-event--find-attendee'. --- lisp/gnus/gnus-icalendar.el | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lisp/gnus/gnus-icalendar.el b/lisp/gnus/gnus-icalendar.el index 7d4fa6c35c..d7e35c5587 100644 --- a/lisp/gnus/gnus-icalendar.el +++ b/lisp/gnus/gnus-icalendar.el @@ -180,8 +180,10 @@ gnus-icalendar-event--find-attendee (or (member (attendee-name prop) name-or-email) (let ((att-email (attendee-email prop))) (gnus-icalendar-find-if - (lambda (email) - (string-match email att-email)) + (lambda (str-or-fun) + (if (functionp str-or-fun) + (funcall str-or-fun att-email) + (string-match str-or-fun att-email))) name-or-email)))))) (gnus-icalendar-find-if #'attendee-prop-matches-p event-props)))) @@ -763,9 +765,8 @@ gnus-icalendar-identities (lambda (x) (if (listp x) x (list x))) (list user-full-name (regexp-quote user-mail-address) ;; NOTE: these can be lists - gnus-ignored-from-addresses ; already regexp-quoted - (unless (functionp message-alternative-emails) ; String or function. - message-alternative-emails) + gnus-ignored-from-addresses ; String or function. + message-alternative-emails ; String or function. (mapcar #'regexp-quote gnus-icalendar-additional-identities))))) ;; TODO: make the template customizable -- 2.28.0