X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=contrib%2Fgnus-namazu.el;h=91db91da7645b09ec509f5659492704cda6d3b5c;hp=8ebe54cea9a04683e055dfb15b2fc2e82ebc5cf8;hb=37645a283b23df8169ab52431b0f0baa24a79533;hpb=449231ab8c3cbbd4d086c78b0f9fdfcb8d206b8e

diff --git a/contrib/gnus-namazu.el b/contrib/gnus-namazu.el
index 8ebe54cea..91db91da7 100644
--- a/contrib/gnus-namazu.el
+++ b/contrib/gnus-namazu.el
@@ -101,6 +101,7 @@
 (require 'nnheader)
 (require 'nnmail)
 (require 'gnus-sum)
+(require 'gmm-utils)
 
 ;; To suppress byte-compile warning.
 (eval-when-compile
@@ -363,9 +364,10 @@ This means that the group \"nnimap+server:INBOX.group\" is placed in
 	   (when (memq (car (setq method (gnus-find-method-for-group group)))
 		       '(nnml nnmh))
 	     (when (file-directory-p
-		    (setq dir (nnmail-group-pathname
-			       (gnus-group-short-name group)
-			       (gnus-namazu/server-directory method))))
+		    (setq dir (let (file-name-handler-alist)
+				(nnmail-group-pathname
+				 (gnus-group-short-name group)
+				 (gnus-namazu/server-directory method)))))
 	       (push (cons dir group) alist)))
 	   (dolist (pair gnus-namazu-remote-groups)
 	     (when (setq dir
@@ -375,7 +377,8 @@ This means that the group \"nnimap+server:INBOX.group\" is placed in
 			     (and (stringp (car pair))
 				  (string-match (car pair) group)
 				  (substring group (match-end 0)))))
-	       (setq dir (nnmail-group-pathname dir "/"))
+	       (setq dir (let (file-name-handler-alist)
+			   (nnmail-group-pathname dir "/")))
 	       (push (cons (concat (cdr pair)
 				   ;; nnmail-group-pathname() on some
 				   ;; systems returns pathnames which
@@ -778,9 +781,9 @@ than the period that is set to `gnus-namazu-index-update-interval'"
 (defun gnus-namazu/update-p (directory &optional force)
   "Return the DIRECTORY when the index undef the DIRECTORY should be updated."
   (setq directory (file-name-as-directory (expand-file-name directory)))
-  (labels ((error-message (format &rest args)
-			  (apply (if force 'error 'message) format args)
-			  nil))
+  (gmm-labels ((error-message (format &rest args)
+			      (apply (if force 'error 'message) format args)
+			      nil))
     (if gnus-namazu/update-process
 	(error-message "%s" "Can not run two update processes simultaneously")
       (and (or force