Merge following changes from semi-1_14 branch:

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.

diff --git a/ChangeLog b/ChangeLog
index 7415c80..70c1e21 100644 (file)
--- 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-09-29  Daiki Ueno  <ueno@unixuser.org>
 
        * mime-edit.el (mime-edit-pgp): New custom group.

diff --git a/mime-edit.el b/mime-edit.el
index 289b405..ccea2e8 100644 (file)
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -1623,6 +1623,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 (file)
--- 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.")