Mercurial > emacs

changeset 81993:83f3a5b8e58f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(vera-re-search-forward, vera-re-search-backward): Remove use of store-match-data.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 20 Jul 2007 04:11:14 +0000
parents df7b7863742c
children 10d258c6090d
files lisp/ChangeLog lisp/progmodes/vera-mode.el
diffstat 2 files changed, 13 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Fri Jul 20 04:09:08 2007 +0000
+++ b/lisp/ChangeLog	Fri Jul 20 04:11:14 2007 +0000
@@ -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.
 
--- a/lisp/progmodes/vera-mode.el	Fri Jul 20 04:09:08 2007 +0000
+++ b/lisp/progmodes/vera-mode.el	Fri Jul 20 04:11:14 2007 +0000
@@ -844,21 +844,19 @@
 
 (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."