[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/checkdoc.el,v

[Juanma Barranquero]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      08/04/08 11:47:48

Index: checkdoc.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emacs-lisp/checkdoc.el,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- checkdoc.el 8 Jan 2008 20:45:33 -0000       1.65
+++ checkdoc.el 8 Apr 2008 11:47:48 -0000       1.66
@@ -1774,10 +1774,9 @@
                                        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)
+                                       (if (string-match-p "^[A-Z]" original)
                                              (capitalize (cdr rs))
-                                           (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 @@
                      "[^-([`':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))))))
+          (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))