X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mailcap.el;h=eb1c09354b5d06231e673bed7eb03868c836e873;hb=f64e139c5380c9b142e90dc9c308bf525a45c8a2;hp=0e6711fc067c48b240940e105292282f574a0132;hpb=ac6014878b28589b78af4ed14309559019b57b9a;p=elisp%2Fflim.git

diff --git a/mailcap.el b/mailcap.el
index 0e6711f..eb1c093 100644
--- a/mailcap.el
+++ b/mailcap.el
@@ -25,6 +25,9 @@
 
 ;;; Code:
 
+(require 'mime-def)
+
+
 ;;; @ comment
 ;;;
 
@@ -92,11 +95,11 @@
 	  (forward-char)))))
 
 (defsubst mailcap-look-at-qchar ()
-  (let ((chr (char-after (point))))
-    (when (eq chr ?\\)
-      (forward-char 2)
-      (char-before (point))
-      )))
+  (when (eq (char-after (point)) ?\\)
+    (prog2
+	(forward-char)
+	(char-after (point))
+      (forward-char))))
 
 (defsubst mailcap-look-at-mtext ()
   (let ((beg (point)))
@@ -167,8 +170,11 @@ order.  Otherwise result is not sorted."
 	    (t entries)
 	    ))))
 
-(defvar mailcap-file "~/.mailcap"
-  "*File name of user's mailcap file.")
+
+(defcustom mailcap-file "~/.mailcap"
+  "*File name of user's mailcap file."
+  :group 'mime
+  :type 'file)
 
 (defun mailcap-parse-file (&optional filename order)
   "Parse FILENAME as a mailcap, and return the result.