Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 52a6d57..7453cf0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2002-03-13  Simon Josefsson  <jas@extundo.com>
+
+       * pop3.el (pop3-open-server): Revert multibyte change.  From
+       Pavel@Janik.cz (Pavel Jan\e,Bm\e(Bk).
+
+       * message.el (message-send-mail-with-qmail): Make it work.  From
+       Pavel@Janik.cz (Pavel Jan\e,Bm\e(Bk).
+
+2002-03-13  Josh Huber  <huber@alum.wpi.edu>
+
+       * message.el (message-make-mft): Set case-fold-search while
+       generating the MFT.  Also, a little cleanup in the MFT code.
+
 2002-03-12  Simon Josefsson  <jas@extundo.com>
 
        * message.el (message-qmail-inject-args): May be function.

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.

diff --git a/lisp/pop3.el b/lisp/pop3.el
index 8971aca..826e6ed 100644 (file)
--- a/lisp/pop3.el
+++ b/lisp/pop3.el
@@ -188,7 +188,7 @@ Nil means no, t means yes, not-nil-or-t means yet to be determined.")
   "Open TCP connection to MAILHOST on PORT.
 Returns the process associated with the connection.
 Argument PORT specifies connecting port."
-  (let (default-enable-multibyte-characters process)
+  (let (process)
     (save-excursion
       (set-buffer (get-buffer-create (concat " trace of POP session to "
                                             mailhost)))