(mime-content-disposition-parameter): Don't strip quoted-string.

[elisp/flim.git] / mel.el

diff --git a/mel.el b/mel.el
index 681be7b..ca0352d 100644 (file)
--- a/mel.el
+++ b/mel.el
@@ -26,20 +26,17 @@
 
 ;;; Code:
 
-(defconst mel-version "7.2")
+(require 'emu)
 
 
 ;;; @ variable
 ;;;
 
-(defvar mime-temp-directory (or (getenv "MIME_TMP_DIR")
-                               (getenv "TM_TMP_DIR")
-                               "/tmp/")
-  "*Directory for temporary files.")
-
 (defvar base64-dl-module
   (and (fboundp 'dynamic-link)
-       (expand-file-name "base64.so" exec-directory)))
+       (let ((path (expand-file-name "base64.so" exec-directory)))
+        (and (file-exists-p path)
+             path))))
 
 
 ;;; @ autoload
@@ -56,6 +53,8 @@
         "Decode current region by base64." t)
        (autoload 'base64-insert-encoded-file "mel-dl"
         "Encode contents of file to base64, and insert the result." t)
+       (autoload 'base64-write-decoded-region "mel-dl"
+        "Decode and write current region encoded by base64 into FILENAME." t)
        ;; for encoded-word
        (autoload 'base64-encoded-length "mel-dl")
        )
@@ -70,6 +69,8 @@
         "Decode current region by base64." t)
        (autoload 'base64-insert-encoded-file "mel-b"
         "Encode contents of file to base64, and insert the result." t)
+       (autoload 'base64-write-decoded-region "mel-b"
+        "Decode and write current region encoded by base64 into FILENAME." t)
        ;; for encoded-word
        (autoload 'base64-encoded-length "mel-b")
        ))
@@ -84,6 +85,9 @@
   "Decode current region by Quoted-Printable." t)
 (autoload 'quoted-printable-insert-encoded-file "mel-q"
   "Encode contents of file to quoted-printable, and insert the result." t)
+(autoload 'quoted-printable-write-decoded-region "mel-q"
+  "Decode and write current region encoded by quoted-printable into FILENAME."
+  t)
 ;; for encoded-word
 (autoload 'q-encoding-encode-string "mel-q"
   "Encode STRING to Q-encoding of encoded-word, and return the result.")
@@ -97,6 +101,8 @@
   "Decode current region by unofficial uuencode format." t)
 (autoload 'uuencode-insert-encoded-file "mel-u"
   "Insert file encoded by unofficial uuencode format." t)
+(autoload 'uuencode-write-decoded-region "mel-u"
+  "Decode and write current region encoded by uuencode into FILENAME." t)
 
 (autoload 'gzip64-encode-region "mel-g"
   "Encode current region by unofficial x-gzip64 format." t)
@@ -104,6 +110,8 @@
   "Decode current region by unofficial x-gzip64 format." t)
 (autoload 'gzip64-insert-encoded-file "mel-g"
   "Insert file encoded by unofficial gzip64 format." t)
+(autoload 'gzip64-write-decoded-region "mel-g"
+  "Decode and write current region encoded by gzip64 into FILENAME." t)
 
 
 ;;; @ region
@@ -139,6 +147,19 @@ STRING is content-transfer-encoding.
 FUNCTION is region decoder.")
 
 ;;;###autoload
+(defvar mime-string-decoding-method-alist
+  '(("base64"           . base64-decode-string)
+    ("quoted-printable" . quoted-printable-decode-string)
+    ("7bit"            . identity)
+    ("8bit"            . identity)
+    ("binary"          . identity)
+    )
+  "Alist of encoding vs. corresponding method to decode string.
+Each element looks like (STRING . FUNCTION).
+STRING is content-transfer-encoding.
+FUNCTION is string decoder.")
+
+;;;###autoload
 (defun mime-encode-region (start end encoding)
   "Encode region START to END of current buffer using ENCODING.
 ENCODING must be string.  If ENCODING is found in
@@ -172,6 +193,21 @@ region by its value."
        (funcall f start end)
       )))
 
+;;;###autoload
+(defun mime-decode-string (string encoding)
+  "Decode STRING using ENCODING.
+ENCODING must be string.  If ENCODING is found in
+`mime-string-decoding-method-alist' as its key, this function decodes
+the STRING by its value."
+  (let ((f (cdr (assoc encoding mime-string-decoding-method-alist))))
+    (if f
+       (funcall f string)
+      (with-temp-buffer
+       (insert string)
+       (mime-decode-region (point-min)(point-max) encoding)
+       (buffer-string)
+       ))))
+
 
 ;;; @ file
 ;;;
@@ -183,9 +219,9 @@ region by its value."
     ;; Not standard, their use is DISCOURAGED.
     ;; ("x-uue"            . uuencode-insert-encoded-file)
     ;; ("x-gzip64"         . gzip64-insert-encoded-file)
-    ("7bit"            . insert-binary-file-contents)
-    ("8bit"            . insert-binary-file-contents)
-    ("binary"          . insert-binary-file-contents)
+    ("7bit"            . insert-file-contents-as-binary)
+    ("8bit"            . insert-file-contents-as-binary)
+    ("binary"          . insert-file-contents-as-binary)
     )
   "Alist of encoding vs. corresponding method to insert encoded file.
 Each element looks like (STRING . FUNCTION).
@@ -193,6 +229,21 @@ STRING is content-transfer-encoding.
 FUNCTION is function to insert encoded file.")
 
 ;;;###autoload
+(defvar mime-file-decoding-method-alist
+  '(("base64"           . base64-write-decoded-region)
+    ("quoted-printable" . quoted-printable-write-decoded-region)
+    ("x-uue"            . uuencode-write-decoded-region)
+    ("x-gzip64"         . gzip64-write-decoded-region)
+    ("7bit"            . write-region-as-binary)
+    ("8bit"            . write-region-as-binary)
+    ("binary"          . write-region-as-binary)
+    )
+  "Alist of encoding vs. corresponding method to write decoded region to file.
+Each element looks like (STRING . FUNCTION).
+STRING is content-transfer-encoding.
+FUNCTION is function to write decoded region to file.")
+
+;;;###autoload
 (defun mime-insert-encoded-file (filename encoding)
   "Insert file FILENAME encoded by ENCODING format."
   (interactive
@@ -206,6 +257,21 @@ FUNCTION is function to insert encoded file.")
        (funcall f filename)
       )))
 
+;;;###autoload
+(defun mime-write-decoded-region (start end filename encoding)
+  "Decode and write current region encoded by ENCODING into FILENAME.
+START and END are buffer positions."
+  (interactive
+   (list (region-beginning) (region-end)
+        (read-file-name "Write decoded region to file: ")
+        (completing-read "encoding: "
+                         mime-file-decoding-method-alist
+                         nil t "base64")))
+  (let ((f (cdr (assoc encoding mime-file-decoding-method-alist))))
+    (if f
+       (funcall f start end filename)
+      )))
+
 
 ;;; @ end
 ;;;