From: Bill Wohler <wohler@newt.com>
Date: Sat, 7 Jan 2006 18:23:44 +0000 (+0000)
Subject: (mh-mml-tag-present-p): Update regexp to handle <mml> tags inserted by
X-Git-Tag: emacs-pretest-22.0.90~4842
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=98b7b7edd50fd33ee57fe77995b2ea8af5b5594e;p=emacs.git

(mh-mml-tag-present-p): Update regexp to handle <mml> tags inserted by
Gnus gnus-summary-mail-forward (closes SF #1399307).
---

diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 1f17d15500e..651757cc378 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-07  Bill Wohler  <wohler@newt.com>
+
+	* mh-mime.el (mh-mml-tag-present-p): Update regexp to handle <mml>
+	tags inserted by Gnus gnus-summary-mail-forward (closes SF
+	#1399307).
+
 2006-01-03  Mark D. Baushke  <mdb@gnu.org>
 
 	* mh-e.el (mh-delete-a-msg): Fix whitespace nit.
diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el
index f7377d80b2d..7336d7034ee 100644
--- a/lisp/mh-e/mh-mime.el
+++ b/lisp/mh-e/mh-mime.el
@@ -693,7 +693,9 @@ the possible security methods (see `mh-mml-method-default')."
   (save-excursion
     (goto-char (point-min))
     (re-search-forward
-     "\\(<#part\\(.\\|\n\\)*>[ \n\t]*<#/part>\\|^<#secure.+>$\\)"
+     (concat
+      "\\(<#\\(mml\\|part\\)\\(.\\|\n\\)*>[ \n\t]*<#/\\(mml\\|part\\)>\\|"
+      "^<#secure.+>$\\)")
      nil t)))