* qmtp.el (qmtp-timeout): New user option.

[elisp/flim.git] / mailcap.el

diff --git a/mailcap.el b/mailcap.el
index 76b3812..25595f0 100644 (file)
--- a/mailcap.el
+++ b/mailcap.el
@@ -86,7 +86,8 @@
 
 (defsubst mailcap-look-at-schar ()
   (let ((chr (char-after (point))))
-    (if (and (>= chr ? )
+    (if (and chr
+            (>= chr ? )
             (/= chr ?\;)
             (/= chr ?\\)
             )
@@ -95,11 +96,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)))
@@ -170,8 +171,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.