From: kose <kose>
Date: Wed, 24 Mar 2004 03:35:23 +0000 (+0000)
Subject: * lisp/gnus-namazu.el (gnus-namazu/directory-table-use): Remove.
X-Git-Tag: t-gnus-6_17_4-quimby-~999
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7fb07962fed7ce9853235b27f55a8a55e3cd160;p=elisp%2Fgnus.git-

* lisp/gnus-namazu.el (gnus-namazu/directory-table-use): Remove.
(gnus-namazu-imap-maildir): New variable.
---

diff --git a/ChangeLog b/ChangeLog
index 69de772..772c11f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-24  KOSEKI Yoshinori  <kose@meadowy.org>
+
+	* lisp/gnus-namazu.el (gnus-namazu/directory-table-use): Remove.
+	(gnus-namazu-imap-maildir): New variable.
+	
 2004-03-09  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* lisp/dgnushack.el (dgnushack-unexporting-files): Add
diff --git a/lisp/gnus-namazu.el b/lisp/gnus-namazu.el
index 31409fd..836fbdc 100644
--- a/lisp/gnus-namazu.el
+++ b/lisp/gnus-namazu.el
@@ -224,9 +224,9 @@ ex. nnimap+server:INBOX."
   :type 'string
   :group 'gnus-namazu)
 
-(defcustom gnus-namazu/directory-table-use t
-  "*Non-nil, use gnus-namazu/directory-table."
-  :type 'boolean
+(defcustom gnus-namazu-imap-maildir nil
+  "*Maildir directory name."
+  :type 'string
   :group 'gnus-namazu)
 
 ;;; Internal Variable:
@@ -392,7 +392,7 @@ ex. nnimap+server:INBOX."
 		       ;; as file names of articles.
 		       (skip-chars-backward "0-9")
 		       (point))))
-	(and (if gnus-namazu/directory-table-use
+	(and (if (not gnus-namazu-imap-maildir)
 		 (setq group
 		       (symbol-value
 			(intern-soft (if gnus-namazu-case-sensitive-filesystem
@@ -404,7 +404,7 @@ ex. nnimap+server:INBOX."
 	       ;; nnimap+server:INBOX.group = ~/Maildir/.group 
 	       ;; Namazu resault: ~/Maildir/.group/123
 	       (setq group (and (string-match 
-				 (concat (expand-file-name "~/Maildir") 
+				 (concat gnus-namazu-imap-maildir
 					 "/\\.\\(.*\\)/") group)
 				(concat gnus-namazu-imap-group-prefix 
 					(match-string 1 group)))))
@@ -794,7 +794,8 @@ than the period that is set to `gnus-namazu-index-update-interval'"
 			 (mapcar 'list gnus-namazu-index-directories) nil t)
       (gnus-namazu/default-index-directory))
     t))
-  (when (setq directory (gnus-namazu/update-p directory force))
+  (when (and (not gnus-namazu-imap-maildir)
+	     (setq directory (gnus-namazu/update-p directory force)))
     (with-current-buffer (get-buffer-create (concat " *mknmz*" directory))
       (buffer-disable-undo)
       (erase-buffer)
@@ -829,9 +830,11 @@ than the period that is set to `gnus-namazu-index-update-interval'"
   (gnus-namazu-update-indices gnus-namazu-index-directories force))
 
 (defun gnus-namazu-update-indices (&optional directories force)
-  (when (setq directories
-	      (delq nil (mapcar (lambda (d) (gnus-namazu/update-p d force))
-				directories)))
+  (when (and (not gnus-namazu-imap-maildir)
+	     (setq directories
+		   (delq nil (mapcar (lambda (d) 
+				       (gnus-namazu/update-p d force)) 
+				     directories))))
     (setq gnus-namazu/update-directories (cons force (cdr directories)))
     (gnus-namazu-update-index (car directories) force)))