From: okada <okada>
Date: Fri, 6 Oct 2000 08:40:55 +0000 (+0000)
Subject: 	* elmo-nntp.el (elmo-nntp-list-folders): Fix for `-'
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=ca62f53bb75c85bf3ccaf03164482168126fda49;p=elisp%2Fwanderlust.git

	* elmo-nntp.el (elmo-nntp-list-folders): Fix for `-'
	(elmo-nntp-list-folders-get-cache): Ditto.
---

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index ca6d1bd..afcde8c 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-06  Kenichi OKADA <okada@opaopa.org>
+
+	* elmo-nntp.el (elmo-nntp-list-folders): Fix for `-'
+	(elmo-nntp-list-folders-get-cache): Ditto.
+
 2000-10-05  Yuuichi Teranishi  <teranisi@gohome.org>
 
 	* elmo-imap4.el (elmo-imap4-search-internal-primitive): Added space
diff --git a/elmo/elmo-nntp.el b/elmo/elmo-nntp.el
index aa51b0d..e51d97a 100644
--- a/elmo/elmo-nntp.el
+++ b/elmo/elmo-nntp.el
@@ -335,8 +335,9 @@ Don't cache if nil.")
 	  (erase-buffer)
 	  (insert (nth 2 elmo-nntp-list-folders-cache))
 	  (goto-char (point-min))
-	  (and folder
-	       (keep-lines (concat "^" (regexp-quote folder) "\\.")))
+	  (or (string= folder "")
+	      (and folder
+		   (keep-lines (concat "^" (regexp-quote folder) "\\."))))
 	  t
 	  )))))
 
@@ -407,7 +408,9 @@ Don't cache if nil.")
 	    (progn
 	      (setq regexp
 		    (format "^\\(%s[^. ]+\\)\\([. ]\\).*\n"
-			    (if folder (concat folder "\\.") "")))
+			    (if (and folder
+				     (null (string= folder "")))
+				(concat folder "\\.") "")))
 	      (while (looking-at regexp)
 		(setq top-ng (elmo-match-buffer 1))
 		(if (string= (elmo-match-buffer 2) " ")