(vera-re-search-forward, vera-re-search-backward):

Remove use of store-match-data.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4f297834a950b5159d1cd0a48d578f8ffcfeb5f7..731ffaf26610f2d045d9a388253519bf5bd885c9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2007-07-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * progmodes/vera-mode.el (vera-re-search-forward)
+       (vera-re-search-backward): Remove use of store-match-data.
+
        * progmodes/flymake.el (flymake-buildfile-dirs): Remove.
        (flymake-find-buildfile): Use locate-dominating-file.
 

diff --git a/lisp/progmodes/vera-mode.el b/lisp/progmodes/vera-mode.el
index 7117ffd15e8acbfce9bffc381ed0c98f5e65917a..07834e028cc42586404ddc4b478469c6d7b26ac1 100644 (file)
--- a/lisp/progmodes/vera-mode.el
+++ b/lisp/progmodes/vera-mode.el
@@ -844,21 +844,19 @@ This function does not modify point or mark."
 
 (defsubst vera-re-search-forward (regexp &optional bound noerror)
   "Like `re-search-forward', but skips over matches in literals."
-  (store-match-data '(nil nil))
-  (while (and (re-search-forward regexp bound noerror)
-             (vera-skip-forward-literal)
-             (progn (store-match-data '(nil nil))
-                    (if bound (< (point) bound) t))))
-  (match-end 0))
+  (let (ret)
+    (while (and (setq ret (re-search-forward regexp bound noerror))
+                (vera-skip-forward-literal)
+                (if bound (< (point) bound) t)))
+    ret))
 
 (defsubst vera-re-search-backward (regexp &optional bound noerror)
   "Like `re-search-backward', but skips over matches in literals."
-  (store-match-data '(nil nil))
-  (while (and (re-search-backward regexp bound noerror)
-             (vera-skip-backward-literal)
-             (progn (store-match-data '(nil nil))
-                    (if bound (> (point) bound) t))))
-  (match-end 0))
+  (let (ret)
+    (while (and (setq ret (re-search-backward regexp bound noerror))
+                (vera-skip-backward-literal)
+                (if bound (> (point) bound) t)))
+    ret))
 
 (defun vera-forward-syntactic-ws (&optional lim skip-directive)
   "Forward skip of syntactic whitespace."