X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fgnus-namazu.el;h=46cc07198417b7fa023447cfd5882f0589694f57;hb=cf9d5b183c1a2edfa14e43126e9915ded64b33f7;hp=ec638dbffca682972d6117837bd779993dbca9f3;hpb=e3cefaa2fa29a9c0778b6613f7414c5e8e026f0b;p=elisp%2Fgnus.git-

diff --git a/lisp/gnus-namazu.el b/lisp/gnus-namazu.el
index ec638db..46cc071 100644
--- a/lisp/gnus-namazu.el
+++ b/lisp/gnus-namazu.el
@@ -17,9 +17,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, you can either send email to this
-;; program's maintainer or write to: The Free Software Foundation,
-;; Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 
 ;;; Commentary:
@@ -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,11 +370,20 @@ 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))
-			  "/"))
-	       (push (cons (concat (cdr pair) (substring dir 1)) group)
+	     (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
+				   ;; have drive letters at their top.
+				   (substring dir (1+ (string-match "/" dir))))
+			   group)
 		     alist)))))
        gnus-newsrc-hashtb)
       (dolist (pair (nconc agent cache alist))