Require 'mime-def instead of 'mel.

[elisp/flim.git] / mel.el

diff --git a/mel.el b/mel.el
index c07e741..01efaf2 100644 (file)
--- a/mel.el
+++ b/mel.el
@@ -26,20 +26,19 @@
 
 ;;; Code:
 
-(defconst mel-version "7.2")
+(require 'emu)
+
+(defconst mel-version "7.5")
 
 
 ;;; @ 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 +55,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 +71,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 +87,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 +103,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 +112,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
@@ -183,9 +193,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).
@@ -225,11 +235,12 @@ FUNCTION is function to write decoded region to file.")
 (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."
-  (list (region-beginning) (region-end)
-       (read-file-name "Write decoded region to file: ")
-       (completing-read "encoding: "
-                        mime-file-decoding-method-alist
-                        nil t "base64"))
+  (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)