From: yamaoka <yamaoka>
Date: Fri, 30 Jul 2004 10:36:58 +0000 (+0000)
Subject: Synch to No Gnus 200407301024.
X-Git-Tag: t-gnus-6_17_4-quimby-~811
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32547b273b2fe6b44f4b95902a89f5842e4f034c;p=elisp%2Fgnus.git-

Synch to No Gnus 200407301024.
---

diff --git a/ChangeLog b/ChangeLog
index a11237c..dc3136b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 2004-07-29  KOSEKI Yoshinori  <kose@meadowy.org>
 
-	* lisp/gnus-namazu.el (gnus-namazu/make-directory-table): Fix normalization
-	of dir (remove drive letter).
+	* lisp/gnus-namazu.el (gnus-namazu/make-directory-table): Fix
+	normalization of dir (remove drive letter).
 
 2004-07-20  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 068fd1b..d386d84 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-30  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* gnus-namazu.el (gnus-namazu/make-directory-table): Treat drive
+	letters when calcurating pathnames of remote groups.
+	From KOSEKI Yoshinori <kose@meadowy.org> (tiny change).
+
 2004-05-27  Simon Josefsson  <jas@extundo.com>
 
 	* starttls.el: Moved to ../lisp/.
diff --git a/lisp/gnus-namazu.el b/lisp/gnus-namazu.el
index d4582ac..081ba22 100644
--- a/lisp/gnus-namazu.el
+++ b/lisp/gnus-namazu.el
@@ -371,8 +371,12 @@ This means that the group \"nnimap+server:INBOX.group\" is placed in
 	       (setq dir (nnmail-group-pathname
 			  (substring group (match-end 0))
 			  "/"))
-	       (push (cons (concat (cdr pair) 
-		   (substring dir (+ 1 (string-match "/" dir)))) group)
+	       (push (cons (concat (cdr pair)
+				   ;; nnmail-group-pathname() on some
+				   ;; systems returns pathnames which
+				   ;; have drive letters at their top.
+				   (substring dir (1+ (string-match "/" dir))))
+			   group)
 		     alist)))))
        gnus-newsrc-hashtb)
       (dolist (pair (nconc agent cache alist))