Synch with Oort Gnus.

[elisp/gnus.git-] / lisp / message.el

diff --git a/lisp/message.el b/lisp/message.el
index 09acdbc..4ba9730 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -3558,8 +3558,8 @@ to find out how to use this."
        ;; free for -inject-arguments -- a big win for the user and for us
        ;; since we don't have to play that double-guessing game and the user
        ;; gets full control (no gestapo'ish -f's, for instance).  --sj
-       (if (functionp 'message-qmail-inject-args)
-           (funcall 'message-qmail-inject-args)
+       (if (functionp message-qmail-inject-args)
+           (funcall message-qmail-inject-args)
          message-qmail-inject-args)))
     ;; qmail-inject doesn't say anything on it's stdout/stderr,
     ;; we have to look at the retval instead
@@ -4554,7 +4554,8 @@ give as trustworthy answer as possible."
 
 (defun message-make-mft ()
   "Return the Mail-Followup-To header."
-  (let* ((msg-recipients (message-options-get 'message-recipients))
+  (let* ((case-fold-search t)
+        (msg-recipients (message-options-get 'message-recipients))
         (recipients
          (mapcar 'mail-strip-quoted-names
                  (message-tokenize-header msg-recipients)))
@@ -4580,15 +4581,15 @@ give as trustworthy answer as possible."
                             (mapcar 'funcall
                                     message-subscribed-address-functions))))
     (save-match-data
-      (when (eval (apply 'append '(or)
+      (when (eval
+            (apply 'append '(or)
+                   (mapcar
+                    #'(lambda (regexp)
                         (mapcar
-                         (function (lambda (regexp)
-                                     (mapcar
-                                      (function (lambda (recipient)
-                                                  `(string-match ,regexp
-                                                                 ,recipient)))
-                                      recipients)))
-                         mft-regexps)))
+                         #'(lambda (recipient)
+                             `(string-match ,regexp ,recipient))
+                         recipients))
+                    mft-regexps)))
        msg-recipients))))
 
 ;; Dummy to avoid byte-compile warning.