(checkdoc-this-string-valid-engine): Use `string-match-p'.

diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el
index b2979693f6ca464b6a0f622bd952ca9b7571f935..d833a358d945deee771236022374b209b058428c 100644 (file)
--- a/lisp/emacs-lisp/checkdoc.el
+++ b/lisp/emacs-lisp/checkdoc.el
@@ -1774,10 +1774,9 @@ function,command,variable,option or symbol." ms1))))))
                                        checkdoc-common-verbs-wrong-voice))
                        (if (not rs) (error "Verb voice alist corrupted"))
                        (setq replace (let ((case-fold-search nil))
-                                       (save-match-data
-                                         (if (string-match "^[A-Z]" original)
-                                             (capitalize (cdr rs))
-                                           (cdr rs)))))
+                                       (if (string-match-p "^[A-Z]" original)
+                                           (capitalize (cdr rs))
+                                         (cdr rs))))
                        (if (checkdoc-autofix-ask-replace
                             (match-beginning 1) (match-end 1)
                             (format "Use the imperative for \"%s\".  \
@@ -1805,11 +1804,10 @@ Replace with \"%s\"? " original replace)
                      "[^-([`':a-zA-Z]\\(\\w+[:-]\\(\\w\\|\\s_\\)+\\)[^]']"
                      e t))
           (setq ms (match-string 1))
-          (save-match-data
-            ;; A . is a \s_ char, so we must remove periods from
-            ;; sentences more carefully.
-            (if (string-match "\\.$" ms)
-                (setq ms (substring ms 0 (1- (length ms))))))
+          ;; A . is a \s_ char, so we must remove periods from
+          ;; sentences more carefully.
+          (when (string-match-p "\\.$" ms)
+            (setq ms (substring ms 0 (1- (length ms)))))
           (if (and (not (checkdoc-in-sample-code-p start e))
                    (not (checkdoc-in-example-string-p start e))
                    (not (member ms checkdoc-symbol-words))