*** empty log message ***

[gnus] / lisp / nndoc.el

diff --git a/lisp/nndoc.el b/lisp/nndoc.el
index d0eac37..b6f560c 100644 (file)
--- a/lisp/nndoc.el
+++ b/lisp/nndoc.el
@@ -96,11 +96,11 @@ One of `mbox', `babyl', `digest', `news', `rnews', `mmdf', `forward',
      (body-begin . "^ ?$")
      (file-end . "^End of")
      (prepare-body-function . nndoc-unquote-dashes)
-     (subtype digest))  ;; impossible to really guess?
+     (subtype digest guess))
     (lanl-gov-announce
       (article-begin . "^\\\\\\\\\n")
       (head-begin . "^Paper.*:")
-      (head-end   . "^\\\\\\\\\n")
+      (head-end   . "\\(^\\\\\\\\.*\n\\|-----------------\\)")
       (body-begin . "")  
       (body-end   . "-------------------------------------------------")     
       (file-end   . "^Title: Recent Seminal")
@@ -489,7 +489,7 @@ One of `mbox', `babyl', `digest', `news', `rnews', `mmdf', `forward',
            (setq subject (concat (match-string 1) subject))
            (setq from (concat (match-string 2) " <" e-mail ">"))))
        ))
-    (while (string-match "(\[^)\]*)" from)
+    (while (and from (string-match "(\[^)\]*)" from))
       (setq from (replace-match "" t t from)))
     (insert "From: "  (or from "unknown")
            "\nSubject: " (or subject "(no subject)") "\n")))
@@ -526,8 +526,8 @@ One of `mbox', `babyl', `digest', `news', `rnews', `mmdf', `forward',
               (funcall nndoc-head-begin-function))
              (nndoc-head-begin 
               (nndoc-search nndoc-head-begin)))
-       (if (and nndoc-file-end
-                (looking-at nndoc-file-end))
+       (if (or (>= (point) (point-max)) (and nndoc-file-end
+                (looking-at nndoc-file-end)))
            (goto-char (point-max))
          (setq head-begin (point))
          (nndoc-search (or nndoc-head-end "^$"))