Merge branch 'master' into unstable

Author: dkprice

README.md

@@ -7,8 +7,6 @@ EasyGrep is a plugin for performing search and replace operations through multip
 
 EasyGrep provides both key mappings and commands to make search and replace easy. When using EasyGrep, searching for a word is as easy as typing <leader>vv (v v, not double-u) over the word for which you want to search.  This search can also be accomplished with the :Grep command and a user-specified pattern. Performing a "replace in files" is similar; type <leader>vr or use the :Replace command. Setting options is easy, simply type <leader>vo or :GrepOptions.  EasyGrep provides a great set of defaults but can also be configured to start up just how you like it; see the script for these options.  Most vimgrep (and grepprg) options are supported.
 
-For a screencast of the script in action go here: http://downloads.veryspeedy.net/vim/EasyGrep.gif
-
 ## Why EasyGrep?
 
 * Supports multiple Grep programs (vimgrep, grep, ack, ag, pt, git grep, csearch).
@@ -76,5 +74,7 @@ Commands:
           3. A user specified directory. The search location is fixed and does
              not change.
 
+## Screencast
 
+![Alt text](https://cloud.githubusercontent.com/assets/2375604/9804914/d0c39ff0-5800-11e5-8e7d-b77543bf2dcf.gif "EasyGrep demo")
 

plugin/EasyGrep.vim

@@ -2857,7 +2857,7 @@ function! s:DoReplace(target, replacement, wholeword, escapeArgs)
 
     let finished = 0
     let lastFile = -1
-    let doAll = 0
+    let doAll = exists("g:EasyGrepAutomatedTest")
     let i = 0
     while i < numMatches && !finished
         try
@@ -3138,7 +3138,7 @@ function! s:ResultListDo(command)
 
     let finished = 0
     let lastFile = -1
-    let doAll = 0
+    let doAll = exists("g:EasyGrepAutomatedTest")
     let i = 0
     while i < numMatches && !finished
         try
@@ -3226,7 +3226,7 @@ function! s:ResultListDo(command)
             endif
 
             if doit
-                exe .a:command
+                exe a:command
             endif
 
             if pendingQuit

tests/__resultlistdo.in

@@ -0,0 +1,2 @@
+resultlistdo
+resultlistopen

tests/_setup.vim

@@ -3,4 +3,5 @@ let g:EasyGrepDefaultUserPattern="alphabet.in"
 let g:EasyGrepMode=3
 let g:EasyGrepExtraWarnings=0
 let g:EasyGrepEnableLogging=1
+let g:EasyGrepAutomatedTest=1
 

tests/resultlistdo.ok

@@ -0,0 +1,8 @@
+|1 col 1| GrepAdd resultlist
+__resultlistdo.in|1 col 1| resultlistdo
+__resultlistdo.in|2 col 1| resultlistopen
+__resultlistdo.in|1 col 1| GrepAdd resultlistfroo
+__resultlistdo.in|1 col 1| resultlistfroo
+__resultlistdo.in|1 col 1| GrepAdd resultlist
+__resultlistdo.in|1 col 1| resultlistdo
+__resultlistdo.in|2 col 1| resultlistopen

tests/resultlistdo.vim

@@ -0,0 +1,30 @@
+
+let testname="resultlistdo"
+let g:EasyGrepDefaultUserPattern="__resultlistdo.in"
+let g:EasyGrepMode=3
+
+" Search
+ResultListTag GrepAdd resultlist
+GrepAdd resultlist
+
+" Exercise
+ResultListDo s/resultlistdo/resultlistfroo/e
+wa
+
+" Search
+ResultListTag GrepAdd resultlistfroo
+GrepAdd resultlistfroo
+
+" Restore the input
+ResultListDo s/resultlistfroo/resultlistdo/e
+wa
+
+" Search again
+ResultListTag GrepAdd resultlist
+GrepAdd resultlist
+
+" Save results
+exe "ResultListSave ".testname.".out"
+
+cclose
+quitall!

tests/vimgrep.suite

@@ -1,4 +1,8 @@
 
+#-------------------------------------------------------------------------------
+# Grep tests
+#-------------------------------------------------------------------------------
+
 # casesensitivity
 casesensitivity_ack.vim
 casesensitivity_ag.vim
@@ -40,3 +44,14 @@ simpleregex_ag.vim
 simpleregex_grep.vim
 simpleregex_pt.vim
 simpleregex_vimgrep.vim
+
+#-------------------------------------------------------------------------------
+# ResultList tests
+#-------------------------------------------------------------------------------
+
+
+#-------------
+# ResultListDo
+#-------------
+resultlistdo.vim
+