From: yamaoka <yamaoka>
Date: Wed, 16 Aug 2000 23:47:52 +0000 (+0000)
Subject: Synch with Gnus.
X-Git-Tag: t-gnus-6_14-quimby-before-installer-changed-~145
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=e15f5da4b1754c7bc21aa506652be7e4aa9bddb2;p=elisp%2Fgnus.git-

Synch with Gnus.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a86f124..8c27fde 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2000-08-16 13:05:46  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* nnslashdot.el (nnslashdot-threaded-retrieve-headers):
+	Failure proof for email addresses.
+	(nnslashdot-sane-retrieve-headers): Ditto.
+
 2000-08-14 20:08:40  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* message.el (message-send-mail): Only insert courtesy message
diff --git a/lisp/nnslashdot.el b/lisp/nnslashdot.el
index e4f1c2f..1a9ac54 100644
--- a/lisp/nnslashdot.el
+++ b/lisp/nnslashdot.el
@@ -91,7 +91,7 @@
             (nnslashdot-threaded-retrieve-headers articles group)
           (nnslashdot-sane-retrieve-headers articles group)))
     (search-failed (nnslashdot-lose why))))
-  
+
 (deffoo nnslashdot-threaded-retrieve-headers (articles group)
   (let ((last (car (last articles)))
 	(did nil)
@@ -154,14 +154,15 @@
 	    (forward-line 1)
 	    (if (looking-at
 		 "by <a[^>]+>\\([^<]+\\)</a>[ \t\n]*.*(\\([^)]+\\))")
-		(setq point (match-end 0) 
-		      from (concat 
-			    (nnweb-decode-entities-string (match-string 1))
-			    " <" (match-string 2) ">"))
-	      (looking-at "by \\(.+\\) on ")
-	      (setq point (match-end 0) 
-		    from (nnweb-decode-entities-string (match-string 1))))
-	    (goto-char (- point 5))
+		(progn
+		  (goto-char (- (match-end 0) 5))
+		  (setq from (concat 
+			      (nnweb-decode-entities-string (match-string 1))
+			      " <" (match-string 2) ">")))
+	      (setq from "")
+	      (when (looking-at "by \\(.+\\) on ")
+		(goto-char (- (match-end 0) 5))
+		(setq from (nnweb-decode-entities-string (match-string 1)))))
 	    (search-forward " on ")
 	    (setq date
 		  (nnslashdot-date-to-date
@@ -255,11 +256,15 @@
 	  (forward-line 1)
 	  (if (looking-at
 	       "by <a[^>]+>\\([^<]+\\)</a>[ \t\n]*.*(\\([^)]+\\))")
-	      (setq from (concat (nnweb-decode-entities-string (match-string 1))
-                                 " <" (match-string 2) ">"))
-	    (looking-at "by \\(.+\\) on ")
-	    (setq from (nnweb-decode-entities-string (match-string 1))))
-	  (goto-char (- (match-end 0) 5))
+	      (progn
+		(goto-char (- (match-end 0) 5))
+		(setq from (concat 
+			    (nnweb-decode-entities-string (match-string 1))
+			    " <" (match-string 2) ">")))
+	    (setq from "")
+	    (when (looking-at "by \\(.+\\) on ")
+	      (goto-char (- (match-end 0) 5))
+	      (setq from (nnweb-decode-entities-string (match-string 1)))))
 	  (search-forward " on ")
 	  (setq date
 		(nnslashdot-date-to-date