# HG changeset patch # User Stefan Monnier # Date 1184904674 0 # Node ID 83f3a5b8e58f6b5f6d0111b6741f68abedf27e92 # Parent df7b7863742c2b395e50b3f3e1fd42129a56a766 (vera-re-search-forward, vera-re-search-backward): Remove use of store-match-data. diff -r df7b7863742c -r 83f3a5b8e58f lisp/ChangeLog --- 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 + * 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 -r df7b7863742c -r 83f3a5b8e58f lisp/progmodes/vera-mode.el --- 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."