summaryrefslogtreecommitdiff
path: root/lisp/gnus/gnus-icalendar.el
diff options
context:
space:
mode:
authorRasmus <rasmus@gmx.us>2020-10-10 22:32:41 +0200
committerLars Ingebrigtsen <larsi@gnus.org>2020-10-10 22:32:41 +0200
commite8fcc14f2819d40283914cf0f9b4f43b2517ba80 (patch)
tree35e5c5a8db57427b82f4929d78dc5cee1bac8595 /lisp/gnus/gnus-icalendar.el
parentf342b7c96929dcb0324c6eded32be4d98a764708 (diff)
downloademacs-e8fcc14f2819d40283914cf0f9b4f43b2517ba80.tar.gz
gnus-icalendar.el: Fix bug in gnus-icalendar-identities
* lisp/gnus/gnus-icalendar.el (gnus-icalendar-event--find-attendee): (gnus-icalendar-identities) `gnus-ignored-from-addresses' and `message-alternative-emails' may be functions. This is not supported by `gnus-icalendar-event--find-attendee' (bug#43908).
Diffstat (limited to 'lisp/gnus/gnus-icalendar.el')
-rw-r--r--lisp/gnus/gnus-icalendar.el11
1 files changed, 6 insertions, 5 deletions
diff --git a/lisp/gnus/gnus-icalendar.el b/lisp/gnus/gnus-icalendar.el
index 7d4fa6c35cc..d7e35c55875 100644
--- a/lisp/gnus/gnus-icalendar.el
+++ b/lisp/gnus/gnus-icalendar.el
@@ -180,8 +180,10 @@
(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 @@ These will be used to retrieve the RSVP information from ical events."
(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