Rename `mailcap-*' to `mm-mailcap-*'.

diff --git a/lisp/mm-encode.el b/lisp/mm-encode.el
index 251ed57..d88502b 100644 (file)
--- a/lisp/mm-encode.el
+++ b/lisp/mm-encode.el
@@ -25,7 +25,7 @@
 ;;; Code:
 
 (require 'mail-parse)
-(require 'mailcap)
+(require 'mm-mailcap)
 
 (defvar mm-content-transfer-encoding-defaults
   '(("text/x-patch" 8bit)
@@ -58,7 +58,7 @@ or base64 will be used, depending on what is more efficient.")
   "Return a default encoding for FILE."
   (if (not (string-match "\\.[^.]+$" file))
       "application/octet-stream"
-    (mailcap-extension-to-mime (match-string 0 file))))
+    (mm-mailcap-extension-to-mime (match-string 0 file))))
 
 (defun mm-encode-content-transfer-encoding (encoding &optional type)
   (cond

diff --git a/lisp/mm-uu.el b/lisp/mm-uu.el
index 1584216..f6273c5 100644 (file)
--- a/lisp/mm-uu.el
+++ b/lisp/mm-uu.el
@@ -30,7 +30,7 @@
 (require 'message)
 (require 'nnheader)
 (require 'mm-decode)
-(require 'mailcap)
+(require 'mm-mailcap)
 
 (eval-and-compile
   (autoload 'binhex-decode-region "binhex")
@@ -186,7 +186,7 @@ To disable dissecting shar codes, for instance, add
               (mm-make-handle (mm-uu-copy-to-buffer start-char end-char)
                     (list (or (and file-name
                                    (string-match "\\.[^\\.]+$" file-name)
-                                   (mailcap-extension-to-mime
+                                   (mm-mailcap-extension-to-mime
                                     (match-string 0 file-name)))
                               "application/octet-stream"))
                     'x-uuencode nil
@@ -197,7 +197,7 @@ To disable dissecting shar codes, for instance, add
               (mm-make-handle (mm-uu-copy-to-buffer start-char end-char)
                     (list (or (and file-name
                                    (string-match "\\.[^\\.]+$" file-name)
-                                   (mailcap-extension-to-mime
+                                   (mm-mailcap-extension-to-mime
                                     (match-string 0 file-name)))
                               "application/octet-stream"))
                     'x-binhex nil