[elpa] master dafd985 3/5: [gnorb] Check message-alternative-emails in helm registry search

[Eric Abrahamsen]

branch: master
commit dafd985dc0f6c8294fa550051e20423af767fbf5
Author: Eric Abrahamsen <address@hidden>
Commit: Eric Abrahamsen <address@hidden>

    [gnorb] Check message-alternative-emails in helm registry search
    
    * packages/gnorb/gnorb-helm.el (gnorb-helm-gnus-registry-candidates):
      In addition to gnus-ignored-from-addresses.
---
 packages/gnorb/gnorb-helm.el | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/gnorb/gnorb-helm.el b/packages/gnorb/gnorb-helm.el
index bcae4f9..8fa6309 100644
--- a/packages/gnorb/gnorb-helm.el
+++ b/packages/gnorb/gnorb-helm.el
@@ -34,13 +34,20 @@
 (defun gnorb-helm-gnus-registry-candidates ()
   "Return a list of candidates from the Gnus registry."
   (let ((check
-        (when gnus-ignored-from-addresses
+        (when (or gnus-ignored-from-addresses
+                  message-alternative-emails)
           (cond ((functionp gnus-ignored-from-addresses)
                  (lambda (adr) (funcall gnus-ignored-from-addresses adr)))
                 ((stringp gnus-ignored-from-addresses)
                  (lambda (adr)
                    (string-match-p
-                    gnus-ignored-from-addresses adr))))))
+                    gnus-ignored-from-addresses adr)))
+                ((functionp message-alternative-emails)
+                 (lambda (adr) (funcall message-alternative-emails adr)))
+                ((stringp message-alternative-emails)
+                 (lambda (adr)
+                   (string-match-p
+                    message-alternative-emails adr))))))
        ret from recipient subject group)
     (maphash
      (lambda (msg-id data)
@@ -52,7 +59,8 @@
                      "%s: %s" ; display
                      (if (and check
                               (funcall check from))
-                         (mapconcat #'identity recipient " ")
+                         (concat
+                          "To: " (mapconcat #'identity recipient " "))
                        from)
                      subject)
                     (cons msg-id group)) ; real