From: morioka <morioka>
Date: Fri, 13 Mar 1998 23:14:58 +0000 (+0000)
Subject: (mailcap-look-at-type-field): Must allow "implicit-wild".
X-Git-Tag: semi-1_1_0~64
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=9669af8f72b21e3e0dbb9efaa7d56edd4572d17e;p=elisp%2Fsemi.git

(mailcap-look-at-type-field): Must allow "implicit-wild".
(mailcap-look-at-field): fixed.
---

diff --git a/mailcap.el b/mailcap.el
index f3b82ce..7e976a4 100644
--- a/mailcap.el
+++ b/mailcap.el
@@ -54,17 +54,18 @@
 
 (defsubst mailcap-look-at-type-field ()
   (let ((type (mailcap-look-at-token)))
-    (if (and type 
-	     (eq (char-after (point)) ?/)
-	     )
-	(progn
-	  (forward-char)
-	  (let ((subtype (mailcap-look-at-token)))
-	    (if subtype
-		(cons (cons 'type (intern type))
-		      (unless (string= subtype "*")
-			(list (cons 'subtype (intern subtype)))
-			))))))))
+    (if type
+	(if (eq (char-after (point)) ?/)
+	    (progn
+	      (forward-char)
+	      (let ((subtype (mailcap-look-at-token)))
+		(if subtype
+		    (cons (cons 'type (intern type))
+			  (unless (string= subtype "*")
+			    (list (cons 'subtype (intern subtype)))
+			    )))))
+	  (list (cons 'type (intern type)))
+	  ))))
 
 
 ;;; @ field separator
@@ -111,9 +112,9 @@
 (defsubst mailcap-look-at-field ()
   (let ((token (mailcap-look-at-token)))
     (if token
-	(if (eq (char-after (point)) ?=)
+	(if (looking-at "[ \t]*=[ \t]*")
 	    (let ((value (progn
-			   (forward-char)
+			   (goto-char (match-end 0))
 			   (mailcap-look-at-mtext))))
 	      (if value
 		  (cons token value)