Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 44b4a78..e058581 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2001-12-19 16:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * nndoc.el (nndoc-type-alist): Move forward to the end.
+
+2001-12-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus.el (gnus-find-subscribed-addresses): Replace `mapc' with
+       `dolist'.
+
 2001-12-19 01:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-win.el (gnus-frames-on-display-list): New.

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 9e0f4c9..febf6eb 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -2422,16 +2422,14 @@ This restriction may disappear in later versions of Gnus."
   "Return a regexp matching the addresses of all subscribed mail groups.
 It consists of the `to-address' or `to-list' parameter of all groups
 with a `subscribed' parameter."
-  (let ((addresses))
-    (mapc (lambda (entry)
-           (let ((group (car entry)))
-             (when (gnus-group-find-parameter group 'subscribed)
-               (let ((address (or
-                               (gnus-group-fast-parameter group 'to-address)
-                               (gnus-group-fast-parameter group 'to-list))))
-                 (when address
-                   (setq addresses (cons address addresses)))))))
-         (cdr gnus-newsrc-alist))
+  (let (group address addresses)
+    (dolist (entry (cdr gnus-newsrc-alist))
+      (setq group (car entry))
+      (when (gnus-group-find-parameter group 'subscribed)
+       (setq address (or (gnus-group-fast-parameter group 'to-address)
+                         (gnus-group-fast-parameter group 'to-list)))
+       (when address
+         (push address addresses))))
     (list (mapconcat 'regexp-quote addresses "\\|"))))
 
 (defmacro gnus-string-or (&rest strings)

diff --git a/lisp/nndoc.el b/lisp/nndoc.el
index 251db7f..a4a639f 100644 (file)
--- a/lisp/nndoc.el
+++ b/lisp/nndoc.el
@@ -73,10 +73,6 @@ from the document.")
      (body-end . "\^_")
      (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.*$")
-     (prepare-body-function . nndoc-unquote-dashes))
     (rfc934
      (article-begin . "^--.*\n+")
      (body-end . "^--.*$")
@@ -139,6 +135,10 @@ from the document.")
      (dissection-function . nndoc-oe-dbx-dissection)
      (generate-head-function . nndoc-oe-dbx-generate-head)
      (generate-article-function . nndoc-oe-dbx-generate-article))
+    (forward
+     (article-begin . "^-+ \\(Start of \\)?forwarded message.*\n+")
+     (body-end . "^-+ End \\(of \\)?forwarded message.*$")
+     (prepare-body-function . nndoc-unquote-dashes))
     (guess
      (guess . t)
      (subtype nil))