merge from semi-1_14:

* mime-edit.el (mime-file-types): Add application/pdf. Use base64
for application/postscript.
(mime-content-types): Add application/pdf.

diff --git a/ChangeLog b/ChangeLog
index f1ffd1b..1dc65bb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-18  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+       * mime-edit.el (mime-file-types): Add application/pdf. Use base64
+       for application/postscript.
+       (mime-content-types): Add application/pdf.
+
 2004-04-04  Yoichi NAKAYAMA  <yoichi@geiin.org>
 
        * mime-edit.el (mime-file-types): Add application/vnd.ms-excel.

diff --git a/mime-edit.el b/mime-edit.el
index b7fb75e..7349ef3 100644 (file)
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -230,6 +230,7 @@ To insert a signature file automatically, call the function
     ("application"
      ("octet-stream" ("type" "" "tar" "shar"))
      ("postscript")
+     ("pdf")
      ("msword")
      ("vnd.ms-excel")
      ("vnd.ms-powerpoint")
@@ -322,7 +323,11 @@ To insert a signature file automatically, call the function
      "inline"          (("filename" . file)))
     ("\\.ps$"
      "application" "postscript"        nil
-     "quoted-printable"
+     "base64"
+     "attachment"      (("filename" . file)))
+    ("\\.pdf$"
+     "application" "pdf"       nil
+     "base64"
      "attachment"      (("filename" . file)))
 
     ;;  Pure binary