From: hmurata <hmurata>
Date: Sat, 2 Dec 2006 12:55:53 +0000 (+0000)
Subject: Sync with semi-1_14 branch.
X-Git-Tag: emiko-1_14-epg-branchpoint~7
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35f786c725fa6e34489506ca264fa3dafd2e96d3;p=elisp%2Fsemi.git

Sync with semi-1_14 branch.
---

diff --git a/ChangeLog b/ChangeLog
index 17d3e77..1821941 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-12-02  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+	* mime-edit.el (mime-edit-process-multipart-1): Don't insert a
+	text tag if a multipart end tag is followed.
+
+2006-06-23  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+	* mime-view.el (mime-calist::field-match-method-ignore-case):
+	New function; set up for `field-match-method' of calist.
+
 2006-02-18  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
 	* mime-edit.el (mime-edit-delete-trailing-whitespace): New
diff --git a/mime-edit.el b/mime-edit.el
index 816cd3b..59220ca 100644
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -1608,6 +1608,7 @@ Parameter must be '(PROMPT CHOICE1 (CHOICE2...))."
 		    (end (match-end 0)))
 		(delete-region beg end)
 		(or (looking-at mime-edit-beginning-tag-regexp)
+		    (looking-at mime-edit-multipart-end-regexp)
 		    (eobp)
 		    (insert (concat (mime-make-text-tag) "\n")))))
 	  (cond ((string-equal type "quote")
diff --git a/mime-view.el b/mime-view.el
index 33dc314..1f53690 100644
--- a/mime-view.el
+++ b/mime-view.el
@@ -631,6 +631,19 @@ Each elements are regexp of field-name.")
 (define-calist-field-match-method
   'body #'mime-calist::field-match-method-as-default-rule)
 
+(defun mime-calist::field-match-method-ignore-case (calist
+						    field-type field-value)
+  (let ((s-field (assoc field-type calist)))
+    (cond ((null s-field)
+	   (cons (cons field-type field-value) calist))
+	  ((eq field-value t)
+	   calist)
+	  ((string= (downcase (cdr s-field)) (downcase field-value))
+	   calist))))
+
+(define-calist-field-match-method
+  'access-type #'mime-calist::field-match-method-ignore-case)
+
 
 (defvar mime-preview-condition nil
   "Condition-tree about how to display entity.")