(imap-send-command): Change EOL-chars when `imap-client-eol' differs

[gnus] / lisp / mml.el

diff --git a/lisp/mml.el b/lisp/mml.el
index 1c68556..320f6aa 100644 (file)
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -32,8 +32,7 @@
   (autoload 'message-make-message-id "message"))
 
 (defvar mml-generate-multipart-alist
-  '(("signed" . rfc2015-generate-signed-multipart)
-    ("encrypted" . rfc2015-generate-encrypted-multipart))
+  nil
   "*Alist of multipart generation functions.
 
 Each entry has the form (NAME . FUNCTION), where
@@ -133,14 +132,14 @@ one charsets.")
   (save-excursion
     (narrow-to-region beg end)
     (goto-char (point-min))
-    (let ((current (or (mm-mime-charset (char-charset (following-char)))
+    (let ((current (or (mm-mime-charset (mm-charset-after))
                       (and use-ascii 'us-ascii)))
          charset struct space newline paragraph)
       (while (not (eobp))
        (cond
         ;; The charset remains the same.
-        ((or (eq (setq charset (mm-mime-charset
-                                (char-charset (following-char)))) 'us-ascii)
+        ((or (eq (setq charset (mm-mime-charset (mm-charset-after))) 
+                 'us-ascii)
              (and use-ascii (not charset))
              (eq charset current)))
         ;; The initial charset was ascii.
@@ -617,7 +616,7 @@ one charsets.")
                  (format "Content type (default %s): " default)
                  (mapcar
                   'list
-                  (delete-duplicates
+                  (mm-delete-duplicates
                    (nconc
                     (mapcar (lambda (m) (cdr m))
                             mailcap-mime-extensions)
@@ -634,8 +633,7 @@ one charsets.")
                                        nil
                                      type)))
                                (cdr l))))
-                      mailcap-mime-data)))
-                   :test 'equal)))))
+                      mailcap-mime-data))))))))
     (if (not (equal string ""))
        string
       default)))