From 87732ef36ad03013efe8a6a29bdf9389f0abade3 Mon Sep 17 00:00:00 2001
From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Mon, 1 Nov 2010 03:58:53 +0000
Subject: [PATCH] gnus-util.el (gnus-string-match-p): New function, that is an
 alias to string-match-p in Emacs >=23. gnus-msg.el
 (gnus-configure-posting-styles) nnir.el (nnir-run-gmane): Use
 gnus-string-match-p.

---
 lisp/gnus/ChangeLog    | 8 ++++++++
 lisp/gnus/gnus-msg.el  | 2 +-
 lisp/gnus/gnus-util.el | 8 ++++++++
 lisp/gnus/nnir.el      | 2 +-
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 37c262ad3d0..1e42c4dc12e 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,11 @@
+2010-11-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-util.el (gnus-string-match-p): New function, that is an alias to
+	string-match-p in Emacs >=23.
+
+	* gnus-msg.el (gnus-configure-posting-styles)
+	* nnir.el (nnir-run-gmane): Use gnus-string-match-p.
+
 2010-11-01  Glenn Morris  <rgm@gnu.org>
 
 	* nnir.el (declare-function): Add compat stub.
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index 46cbc75f2a5..544aa7776a8 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -1892,7 +1892,7 @@ this is a reply."
 		  (cond
 		   ((stringp value)
 		    (if (and (stringp match)
-			     (string-match-p "\\\\[&[:digit:]]" value)
+			     (gnus-string-match-p "\\\\[&[:digit:]]" value)
 			     (match-beginning 1))
 			(gnus-match-substitute-replacement value nil nil group)
 		      value))
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 239d81075dd..94b7c633196 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -2010,6 +2010,14 @@ This is the definition of match-substitute-replacement in subr.el from GNU Emacs
 				  (match-data t)))
 	  (replace-match replacement fixedcase literal match subexp)))))))
 
+(if (fboundp 'string-match-p)
+    (defalias 'gnus-string-match-p 'string-match-p)
+  (defsubst gnus-string-match-p (regexp string &optional start)
+    "\
+Same as `string-match' except this function does not change the match data."
+    (save-match-data
+      (string-match regexp string start))))
+
 (provide 'gnus-util)
 
 ;;; gnus-util.el ends here
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el
index 073df1928bc..bfe4df8ee1b 100644
--- a/lisp/gnus/nnir.el
+++ b/lisp/gnus/nnir.el
@@ -1392,7 +1392,7 @@ Tested with Namazu 2.0.6 on a GNU/Linux system."
 ;; gmane interface
 (defun nnir-run-gmane (query srv &optional groups)
   "Run a search against a gmane back-end server."
-  (if (string-match-p "gmane" srv)
+  (if (gnus-string-match-p "gmane" srv)
       (let* ((case-fold-search t)
 	     (qstring (cdr (assq 'query query)))
 	     (server (cadr (gnus-server-to-method srv)))
-- 
2.39.5