[Gnus] XEmacs 21.5 compilation fix

* gnus-score.el (gnus-score-decode-text-parts): Use #' for
  mm-text-parts used in labels macro to make it work with XEmacs 21.5.
* gnus-util.el (gnus-string-prefix-p): New function, an alias to
  string-prefix-p in Emacs >=23.2.
* nnmaildir.el (nnmaildir--ensure-suffix, nnmaildir--add-flag)
  (nnmaildir--remove-flag, nnmaildir--scan): Use gnus-string-match-p
  instead of string-match-p.
  (nnmaildir--scan): Use gnus-string-prefix-p instead of string-prefix-p.

4 files changed, 30 insertions, 8 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 0a7866794a8..ddb0143b37a 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,16 @@
+2012-09-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-score.el (gnus-score-decode-text-parts): Use #' for
+        mm-text-parts used in labels macro to make it work with XEmacs 21.5.
+
+        * gnus-util.el (gnus-string-prefix-p): New function, an alias to
+        string-prefix-p in Emacs >=23.2.
+
+        * nnmaildir.el (nnmaildir--ensure-suffix, nnmaildir--add-flag)
+        (nnmaildir--remove-flag, nnmaildir--scan): Use gnus-string-match-p
+        instead of string-match-p.
+        (nnmaildir--scan): Use gnus-string-prefix-p instead of string-prefix-p.
+
 2012-09-06  Kenichi Handa  <handa@gnu.org>
 
         * qp.el (quoted-printable-decode-region): Fix previous change; handle
diff --git a/lisp/gnus/gnus-score.el b/lisp/gnus/gnus-score.el
index bc35cf3dea5..f215b845514 100644
--- a/lisp/gnus/gnus-score.el
+++ b/lisp/gnus/gnus-score.el
@@ -1720,7 +1720,7 @@ score in `gnus-newsgroup-scored' by SCORE."
 (defun gnus-score-decode-text-parts ()
   (labels ((mm-text-parts (handle)
                         (cond ((stringp (car handle))
-                               (let ((parts (mapcan 'mm-text-parts (cdr handle))))
+                               (let ((parts (mapcan #'mm-text-parts (cdr handle))))
                                  (if (equal "multipart/alternative" (car handle))
                                      ;; pick the first supported alternative
                                      (list (car parts))
@@ -1730,7 +1730,7 @@ score in `gnus-newsgroup-scored' by SCORE."
                                (when (string-match "^text/" (mm-handle-media-type handle))
                                  (list handle)))
 
-                              (t (mapcan 'mm-text-parts handle))))
+                              (t (mapcan #'mm-text-parts handle))))
            (my-mm-display-part (handle)
                                (when handle
                                  (save-restriction
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 26178afa864..3c4af9b4e50 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -1926,6 +1926,15 @@ Same as `string-match' except this function does not change the match data."
     (save-match-data
       (string-match regexp string start))))
 
+(if (fboundp 'string-prefix-p)
+    (defalias 'gnus-string-prefix-p 'string-prefix-p)
+  (defun gnus-string-prefix-p (str1 str2 &optional ignore-case)
+    "Return non-nil if STR1 is a prefix of STR2.
+If IGNORE-CASE is non-nil, the comparison is done without paying attention
+to case differences."
+    (eq t (compare-strings str1 nil nil
+                           str2 0 (length str1) ignore-case))))
+
 (eval-and-compile
   (if (fboundp 'macroexpand-all)
       (defalias 'gnus-macroexpand-all 'macroexpand-all)
diff --git a/lisp/gnus/nnmaildir.el b/lisp/gnus/nnmaildir.el
index 327649d41a1..74a693a9c61 100644
--- a/lisp/gnus/nnmaildir.el
+++ b/lisp/gnus/nnmaildir.el
@@ -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)))