X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fnnmaildir.el;h=7d33e511baa11541c57b5ea9e0503ebaea0ed624;hb=29d6ab084e7af7bfd2a6da38fde6eadfbe075bfa;hp=327649d41a1c514cb0451f9e47ab1138ab210c71;hpb=cc50e3e15d7a8c8fe77ce93c370fb8e6b90e8de5;p=gnus

diff --git a/lisp/nnmaildir.el b/lisp/nnmaildir.el
index 327649d41..7d33e511b 100644
--- a/lisp/nnmaildir.el
+++ b/lisp/nnmaildir.el
@@ -63,17 +63,17 @@
 (eval-and-compile
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
 
-(eval-and-compile
-  (require 'nnheader)
-  (require 'gnus)
-  (require 'gnus-util)
-  (require 'gnus-range)
-  (require 'gnus-start)
-  (require 'gnus-int)
-  (require 'message))
+(require 'nnheader)
+(require 'gnus)
+(require 'gnus-util)
+(require 'gnus-range)
+(require 'gnus-start)
+(require 'gnus-int)
+(require 'message)
+(require 'nnmail)
+
 (eval-when-compile
-  (require 'cl)
-  (require 'nnmail))
+  (require 'cl))
 
 (defconst nnmaildir-version "Gnus")
 
@@ -100,14 +100,14 @@ See `nnmaildir-flag-mark-mapping'."
 
 (defun nnmaildir--ensure-suffix (filename)
   "Ensure that FILENAME contains the suffix \":2,\"."
-  (if (string-match-p ":2," filename)
+  (if (gnus-string-match-p ":2," filename)
       filename
     (concat filename ":2,")))
 
 (defun nnmaildir--add-flag (flag suffix)
   "Return a copy of SUFFIX where FLAG is set.
 SUFFIX should start with \":2,\"."
-  (unless (string-match-p "^:2," suffix)
+  (unless (gnus-string-match-p "^:2," suffix)
     (error "Invalid suffix `%s'" suffix))
   (let* ((flags (substring suffix 3))
 	 (flags-as-list (append flags nil))
@@ -120,7 +120,7 @@ SUFFIX should start with \":2,\"."
 (defun nnmaildir--remove-flag (flag suffix)
   "Return a copy of SUFFIX where FLAG is cleared.
 SUFFIX should start with \":2,\"."
-  (unless (string-match-p "^:2," suffix)
+  (unless (gnus-string-match-p "^:2," suffix)
     (error "Invalid suffix `%s'" suffix))
   (let* ((flags (substring suffix 3))
 	 (flags-as-list (append flags nil))
@@ -856,11 +856,11 @@ by nnmaildir-request-article.")
 	      (when (or
 		     ;; first look for marks in suffix, if it's valid...
 		     (when (and (stringp suffix)
-				(string-prefix-p ":2," suffix))
+				(gnus-string-prefix-p ":2," suffix))
 		       (or
-			(not (string-match-p
+			(not (gnus-string-match-p
 			      (string (nnmaildir--mark-to-flag 'read)) suffix))
-			(string-match-p
+			(gnus-string-match-p
 			 (string (nnmaildir--mark-to-flag 'tick)) suffix)))
 		     ;; then look in marks directories
 		     (not (file-exists-p (concat cdir prefix)))