From: yamaoka <yamaoka>
Date: Thu, 22 Dec 2005 07:01:33 +0000 (+0000)
Subject: Synch to No Gnus 200512220631.
X-Git-Tag: t-gnus-6_17_4-quimby-~165
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=fcc29e0a992a6b7b86d5788591f31bda36774867;p=elisp%2Fgnus.git-

Synch to No Gnus 200512220631.
---

diff --git a/ChangeLog b/ChangeLog
index 03cdf80..5e5f46c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-12-22  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* lisp/gnus-namazu.el (gnus-namazu-remote-groups): Accept `t' as an
+	symbol that matches the method specified by `gnus-select-method'.
+	(gnus-namazu/make-directory-table): Follow the above change.
+	(gnus-namazu/call-namazu): Wrap a query string with quotes.
+
 2005-12-06  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* GNUS-NEWS: Generated.
diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 2e654db..39be43c 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,10 @@
+2005-12-22  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+	* gnus-namazu.el (gnus-namazu-remote-groups): Accept `t' as an
+	symbol that matches the method specified by `gnus-select-method'.
+	(gnus-namazu/make-directory-table): Follow the above change.
+	(gnus-namazu/call-namazu): Wrap a query string with quotes.
+
 2005-12-05  Adrian Aichner  <adrian@xemacs.org>
 
 	* nnir.el: New variable nnir-swish-e-index-files to support
diff --git a/lisp/gnus-namazu.el b/lisp/gnus-namazu.el
index d09d0ab..46cc071 100644
--- a/lisp/gnus-namazu.el
+++ b/lisp/gnus-namazu.el
@@ -237,7 +237,8 @@ This means that the group \"nnimap+server:INBOX.group\" is placed in
 \"~/Maildir/.group\"."
   :group 'gnus-namazu
   :type '(repeat
-	  (cons (regexp :tag "Regexp of group name")
+	  (cons (choice (regexp :tag "Regexp of group name")
+			(const :tag "Groups served by `gnus-select-method'" t))
 		(string :tag "Base path of groups")))
   :set (lambda (symbol value)
 	 (prog1 (set-default symbol value)
@@ -336,7 +337,9 @@ This means that the group \"nnimap+server:INBOX.group\" is placed in
 		       "-a"		; show all matches
 		       "-l")		; use list format
 		 gnus-namazu-additional-arguments
-		 (list query)
+		 (list (if gnus-namazu-command-prefix
+			   (concat "'" query "'")
+			 query))
 		 gnus-namazu-index-directories)))
     (apply 'call-process (car commands) nil t nil (cdr commands))))
 
@@ -367,10 +370,14 @@ This means that the group \"nnimap+server:INBOX.group\" is placed in
 			       (gnus-namazu/server-directory method))))
 	       (push (cons dir group) alist)))
 	   (dolist (pair gnus-namazu-remote-groups)
-	     (when (string-match (car pair) group)
-	       (setq dir (nnmail-group-pathname
-			  (substring group (match-end 0))
-			  "/"))
+	     (when (setq dir
+			 (or (and (eq t (car pair))
+				  (gnus-method-equal method gnus-select-method)
+				  group)
+			     (and (stringp (car pair))
+				  (string-match (car pair) group)
+				  (substring group (match-end 0)))))
+	       (setq dir (nnmail-group-pathname dir "/"))
 	       (push (cons (concat (cdr pair)
 				   ;; nnmail-group-pathname() on some
 				   ;; systems returns pathnames which