From: yamaoka <yamaoka>
Date: Tue, 29 Aug 2000 06:59:28 +0000 (+0000)
Subject: Synch with `t-gnus-6_14'.
X-Git-Tag: t-gnus-6_14-quimby-before-installer-changed-~127
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84bad8d9edfa403fc56e22964818951a6ffdc465;p=elisp%2Fgnus.git-

Synch with `t-gnus-6_14'.
---

diff --git a/ChangeLog b/ChangeLog
index 9245f36..e6307ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-29  TSUCHIYA Masatoshi  <tsuchiya@pine.kuee.kyoto-u.ac.jp>
+
+	* lisp/nnshimbun.el (nnshimbun-zdnet-get-headers): Follow changes
+	of ZDNet.
+
 2000-08-25  Katsumi Yamaoka <yamaoka@jpl.org>
 
 	* lisp/gnus-vers.el (gnus-revision-number): Increment to 04.
diff --git a/lisp/nnshimbun.el b/lisp/nnshimbun.el
index be376c6..8f7edb3 100644
--- a/lisp/nnshimbun.el
+++ b/lisp/nnshimbun.el
@@ -1087,18 +1087,18 @@ is enclosed by at least one regexp grouping construct."
 	(delete-region start (point))))
     (goto-char (point-min))
     (while (re-search-forward
-	    "<a href=\"\\(\\([0-9][0-9]\\)\\([0-9][0-9]\\)/\\([0-9][0-9]\\)/\\([^\\.]+\\).html\\)\"><font size=\"4\"><strong>"
+	    "<a href=\"\\(/news/\\)?\\(\\([0-9][0-9]\\)\\([0-9][0-9]\\)/\\([0-9][0-9]\\)/\\([^\\.]+\\).html\\)\"><font size=\"4\"><strong>"
 	    nil t)
-      (let ((year  (+ 2000 (string-to-number (match-string 2))))
-	    (month (string-to-number (match-string 3)))
-	    (day   (string-to-number (match-string 4)))
+      (let ((year  (+ 2000 (string-to-number (match-string 3))))
+	    (month (string-to-number (match-string 4)))
+	    (day   (string-to-number (match-string 5)))
 	    (id    (format "<%s%s%s%s%%%s>"
-			   (match-string 2)
 			   (match-string 3)
 			   (match-string 4)
 			   (match-string 5)
+			   (match-string 6)
 			   nnshimbun-current-group))
-	    (url (match-string 1)))
+	    (url (match-string 2)))
 	(push (make-full-mail-header
 	       0
 	       (nnshimbun-mime-encode-string