* nndoc.el (nndoc-mail-in-mail-type-p): Break a long regexp into

	pieces.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ac7cf5d..fbf61f2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-06  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * nndoc.el (nndoc-mail-in-mail-type-p): Break a long regexp into
+       pieces.
+
 2002-03-05  Paul Jarc  <prj@po.cwru.edu>
 
        * nnnil.el: New file.

diff --git a/lisp/nndoc.el b/lisp/nndoc.el
index bb2b805..3bcec06 100644 (file)
--- a/lisp/nndoc.el
+++ b/lisp/nndoc.el
@@ -707,9 +707,11 @@ from the document.")
 
 (defun nndoc-mail-in-mail-type-p ()
   (save-excursion
-    (and (search-forward "\n\n" nil t)
-        (re-search-forward "^[-A-Za-z0-9]+: .*\n\\([ \t]?.*\n\\)*\\(^[-A-Za-z0-9]+: .*\n\\([ \t]?.*\n\\)*\\)+\n" nil t)
-        t)))
+    (while (re-search-forward "\n\n[-A-Za-z0-9]+:" nil t)
+      (forward-line)
+      (while (looking-at "[ \t]\\|[-A-Za-z0-9]+:")
+       (forward-line))
+      (looking-at "\n"))))
 
 (defun nndoc-mail-in-mail-article-begin ()
   (when (re-search-forward "^[-A-Za-z0-9]+: .*\n\\([ \t]?.*\n\\)*\\(^[-A-Za-z0-9]+: .*\n\\([ \t]?.*\n\\)*\\)+\n" nil t)