Importing Pterodactyl Gnus v0.83.

[elisp/gnus.git-] / lisp / mm-encode.el

diff --git a/lisp/mm-encode.el b/lisp/mm-encode.el
index e3bd0af..587abf8 100644 (file)
--- a/lisp/mm-encode.el
+++ b/lisp/mm-encode.el
@@ -1,5 +1,5 @@
 ;;; mm-encode.el --- Functions for encoding MIME things
-;; Copyright (C) 1998 Free Software Foundation, Inc.
+;; Copyright (C) 1998,99 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;     MORIOKA Tomohiko <morioka@jaist.ac.jp>
@@ -25,53 +25,13 @@
 ;;; Code:
 
 (require 'mail-parse)
-
-(defvar mm-mime-file-types
-  '(("\\.rtf$" "text/richtext")
-    ("\\.\\(html\\|htm\\)$" "text/html")
-    ("\\.ps$" "application/postscript"
-     (encoding quoted-printable)
-     (disposition "attachment"))
-    ("\\.\\(jpeg\\|jpg\\)$" "image/jpeg")
-    ("\\.gif$" "image/gif")
-    ("\\.png$" "image/png")
-    ("\\.\\(tiff\\|tif\\)$" "image/tiff")
-    ("\\.pic$" "image/x-pic")
-    ("\\.mag$" "image/x-mag")
-    ("\\.xbm$" "image/x-xbm")
-    ("\\.xwd$" "image/x-xwd")
-    ("\\.au$" "audio/basic")
-    ("\\.mpg$" "video/mpeg")
-    ("\\.txt$" "text/plain")
-    ("\\.el$" "application/octet-stream"
-     ("type" ."emacs-lisp"))
-    ("\\.lsp$" "application/octet-stream"
-     ("type" "common-lisp"))
-    ("\\.tar\\.gz$" "application/octet-stream"
-     ("type" "tar+gzip"))
-    ("\\.tgz$" "application/octet-stream"
-     ("type" "tar+gzip"))
-    ("\\.tar\\.Z$" "application/octet-stream"
-     ("type" "tar+compress"))
-    ("\\.taz$" "application/octet-stream"
-     ("type" "tar+compress"))
-    ("\\.gz$" "application/octet-stream"
-     ("type" "gzip"))
-    ("\\.Z$" "application/octet-stream"
-     ("type" "compress"))
-    ("\\.lzh$" "application/octet-stream"
-     ("type" . "lha"))
-    ("\\.zip$" "application/zip")
-    ("\\.diffs?$" "text/plain"
-     ("type" . "patch"))
-    ("\\.patch$" "application/octet-stream"
-     ("type" "patch"))
-    ("\\.signature" "text/plain")
-    (".*" "application/octet-stream"))
-  "*Alist of regexps and MIME types.")
+(require 'mailcap)
 
 (defvar mm-content-transfer-encoding-defaults
   '(("text/.*" quoted-printable)
+    ("message/rfc822" 8bit)
+    ("application/emacs-lisp" 8bit)
+    ("application/x-patch" 8bit)
     (".*" base64))
   "Alist of regexps that match MIME types and their encodings.")
 
@@ -93,13 +53,9 @@
 
 (defun mm-default-file-encoding (file)
   "Return a default encoding for FILE."
-  (let ((types mm-mime-file-types)
-       type)
-    (catch 'found
-      (while (setq type (pop types))
-       (when (string-match (car type) file)
-         (throw 'found (cdr type)))
-       (pop types)))))
+  (if (not (string-match "\\.[^.]+$" file))
+      "application/octet-stream"
+    (mailcap-extension-to-mime (match-string 0 file))))
 
 (defun mm-encode-content-transfer-encoding (encoding &optional type)
   (cond
@@ -110,21 +66,17 @@
       (goto-char (point-min))
       (while (search-forward "\n" nil t)
        (replace-match "\r\n" t t)))
-    (condition-case ()
+    (condition-case error
        (base64-encode-region (point-min) (point-max))
-      (error nil)))
+      (error
+       (message "Error while decoding: %s" error)
+       nil)))
    ((memq encoding '(7bit 8bit binary))
     )
    ((null encoding)
     )
-   ((eq encoding 'x-uuencode)
-    (condition-case ()
-       (uudecode-encode-region (point-min) (point-max))
-      (error nil)))
    ((functionp encoding)
-    (condition-case ()
-       (funcall encoding (point-min) (point-max))
-      (error nil)))
+    (ignore-errors (funcall encoding (point-min) (point-max))))
    (t
     (message "Unknown encoding %s; defaulting to 8bit" encoding))))
 
@@ -141,7 +93,7 @@ The encoding used is returned."
 
 (defun mm-insert-headers (type encoding &optional file)
   "Insert headers for TYPE."
-  (insert "Content-Type: " (car type))
+  (insert "Content-Type: " type)
   (when file
     (insert ";\n\tname=\"" (file-name-nondirectory file) "\""))
   (insert "\n")