Require 'mime-def instead of 'mel.

[elisp/flim.git] / mel.el

diff --git a/mel.el b/mel.el
index 11cb389..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
@@ -194,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).