Sync.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 536b2c6..b09024e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2000-04-27 23:23:37  Shenghuo ZHU  <zsh@cs.rochester.edu>
+
+       * nndoc.el (nndoc-type-alist): Change forward regexp. 
+
 2000-04-27 21:57:10  Shenghuo ZHU  <zsh@cs.rochester.edu>
 
        * message.el (message-send-mail-partially-limit): Change the

diff --git a/lisp/nndoc.el b/lisp/nndoc.el
index 876cee7..363ff3c 100644 (file)
--- a/lisp/nndoc.el
+++ b/lisp/nndoc.el
@@ -71,8 +71,8 @@ from the document.")
      (body-begin-function . nndoc-babyl-body-begin)
      (head-begin-function . nndoc-babyl-head-begin))
     (forward
-     (article-begin . "^-+ Start of forwarded message -+\n+")
-     (body-end . "^-+ End of forwarded message -+$")
+     (article-begin . "^-+ \\(Start of \\)?forwarded message -+\n+")
+     (body-end . "^-+ End \\(of \\)?forwarded message -+$")
      (prepare-body-function . nndoc-unquote-dashes))
     (rfc934
      (article-begin . "^--.*\n+")