From: yamaoka <yamaoka>
Date: Tue, 20 Feb 2001 03:11:44 +0000 (+0000)
Subject: Synch with Oort Gnus.
X-Git-Tag: t-gnus-6_15_0-09-quimby~19
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f0045423af3efc9431a66d9d70a441feb601709;p=elisp%2Fgnus.git-

Synch with Oort Gnus.
---

diff --git a/lisp/nnweb.el b/lisp/nnweb.el
index ebe13af..cf18fb6 100644
--- a/lisp/nnweb.el
+++ b/lisp/nnweb.el
@@ -750,15 +750,21 @@ and `altavista'.")
 	    (setq Subject (buffer-string))
 	    (goto-char (point-max))
 	    (widen)
-	    (narrow-to-region (re-search-forward "<a[^>]+>" nil t)
-			      (search-forward "</a>" nil t))
-	    (nnweb-remove-markup)
-	    (nnweb-decode-entities)
-	    (setq Newsgroups (buffer-string))
-	    (goto-char (point-max))
-	    (widen)
-	    (when (looking-at
-		   "[ \t]*-[ \t]*\\([0-9]+/[A-Za-z]+/[0-9]+\\)[ \t]*by[ \t]*\\([^<]*\\) - <a")
+	    (forward-line 2)
+	    (when (looking-at "<br><font[^>]+>")
+	      (goto-char (match-end 0)))
+	    (if (not (looking-at "<a[^>]+>"))
+		(skip-chars-forward " \t")
+	      (narrow-to-region (point)
+				(search-forward "</a>" nil t))
+	      (nnweb-remove-markup)
+	      (nnweb-decode-entities)
+	      (setq Newsgroups (buffer-string))
+	      (goto-char (point-max))
+	      (widen)
+	      (skip-chars-forward "- \t"))
+	    (when (looking-at 
+		   "\\([0-9]+/[A-Za-z]+/[0-9]+\\)[ \t]*by[ \t]*\\([^<]*\\) - <a")
 	      (setq From (match-string 2)
 		    Date (match-string 1)))
 	    (forward-line 1)
@@ -768,8 +774,10 @@ and `altavista'.")
 	       (list
 		(incf (cdr active))
 		(make-full-mail-header
-		 (cdr active) (concat  "(" Newsgroups ") " Subject) From Date
-		 Message-ID
+		 (cdr active) (if Newsgroups
+				  (concat  "(" Newsgroups ") " Subject) 
+				Subject)
+		 From Date Message-ID
 		 nil 0 0 url))
 	       map)
 	      (nnweb-set-hashtb (cadar map) (car map))))