From: yamaoka <yamaoka>
Date: Sun, 8 Dec 2002 12:37:04 +0000 (+0000)
Subject: Synch with Oort Gnus.
X-Git-Tag: t-gnus-6_15_10-00-quimby~49
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2d07b4ca554cd0da2f7db9840b310b3e9d76136;p=elisp%2Fgnus.git-

Synch with Oort Gnus.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bde7c11..87f2b17 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2002-12-07  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* nnslashdot.el (nnslashdot-retrieve-headers-1): Update the parser.
+
+2002-12-06  Paul Jarc  <prj@po.cwru.edu>
+
+	* nnmaildir.el (nnmaildir-request-group): bugfix: don't erase
+	nntp-server-buffer if we aren't going to write to it.
+
 2002-12-04  Katsumi Yamaoka  <yamaoka@jpl.org>
 	Trivial patch from Itai Zukerman <zukerman@math-hat.com>.
 
diff --git a/lisp/nnmaildir.el b/lisp/nnmaildir.el
index f514f5c..641ebcb 100644
--- a/lisp/nnmaildir.el
+++ b/lisp/nnmaildir.el
@@ -926,16 +926,16 @@ by nnmaildir-request-article.")
 (defun nnmaildir-request-group (gname &optional server fast)
   (let ((group (nnmaildir--prepare server gname))
 	deactivate-mark)
-    (nnmaildir--with-nntp-buffer
-      (erase-buffer)
-      (catch 'return
-	(unless group
-	  (insert "411 no such news group\n")
-	  (setf (nnmaildir--srv-error nnmaildir--cur-server)
-		(concat "No such group: " gname))
-	  (throw 'return nil))
-	(setf (nnmaildir--srv-curgrp nnmaildir--cur-server) group)
-	(if fast (throw 'return t))
+    (catch 'return
+      (unless group
+	;; (insert "411 no such news group\n")
+	(setf (nnmaildir--srv-error nnmaildir--cur-server)
+	      (concat "No such group: " gname))
+	(throw 'return nil))
+      (setf (nnmaildir--srv-curgrp nnmaildir--cur-server) group)
+      (if fast (throw 'return t))
+      (nnmaildir--with-nntp-buffer
+	(erase-buffer)
 	(insert "211 ")
 	(princ (nnmaildir--grp-count group) nntp-server-buffer)
 	(insert " ")
diff --git a/lisp/nnslashdot.el b/lisp/nnslashdot.el
index 9e2766f..3731a73 100644
--- a/lisp/nnslashdot.el
+++ b/lisp/nnslashdot.el
@@ -153,18 +153,24 @@
 	      (setq subject (concat "Re: " (substring subject (match-end 0)))))
 	    (setq subject (mm-url-decode-entities-string subject))
 	    (search-forward "<BR>")
-	    (if (looking-at
-		 "by[ \t\n]+<a[^>]+>\\([^<]+\\)</a>[ \t\n]*(\\(<[^>]+>\\)*\\([^<>)]+\\))")
-		(progn
-		  (goto-char (- (match-end 0) 5))
-		  (setq from (concat
-			      (mm-url-decode-entities-string (match-string 1))
-			      " <" (match-string 3) ">")))
-	      (setq from "")
-	      (when (looking-at "by \\([^<>]*\\) on ")
-		(goto-char (- (match-end 0) 5))
-		(setq from (mm-url-decode-entities-string (match-string 1)))))
-	    (search-forward " on ")
+	    (cond 
+	     ((looking-at
+	       "by[ \t\n]+<a[^>]+>\\([^<]+\\)</a>[ \t\n]*(\\(<[^>]+>\\)*\\([^<>)]+\\))")
+	      (goto-char (- (match-end 0) 5))
+	      (setq from (concat
+			  (mm-url-decode-entities-string (match-string 1))
+			  " <" (match-string 3) ">")))
+	     ((looking-at "by[ \t\n]+<a[^>]+>\\([^<(]+\\) (\\([0-9]+\\))</a>")
+	      (goto-char (- (match-end 0) 5))
+	      (setq from (concat 
+			  (mm-url-decode-entities-string (match-string 1))
+			  " <" (match-string 2) ">")))
+	     ((looking-at "by \\([^<>]*\\)[\t\n\r ]+on ")
+	      (goto-char (- (match-end 0) 5))
+	      (setq from (mm-url-decode-entities-string (match-string 1))))
+	     (t
+	      (setq from "")))
+	    (search-forward "on ")
 	    (setq date
 		  (nnslashdot-date-to-date
 		   (buffer-substring (point) (progn (skip-chars-forward "^()<>\n\r") (point)))))