support incsearch

Author: ZSaberLv0

plugin/incsearch.vim

@@ -21,7 +21,7 @@ endif
 
 function! s:onUpdate()
     if getcmdtype() != ':'
-                \ || !get(g:, 'eregex_incsearch', get(b:, 'eregex_incsearch', &incsearch))
+                \ || !get(b:, 'eregex_incsearch', get(g:, 'eregex_incsearch', &incsearch))
         return
     endif
     let cmd = s:cmdParse(getcmdline())
@@ -57,7 +57,11 @@ function! s:onUpdate()
             let curpos[1] = pos[0]
             let curpos[2] = pos[1]
             call setpos('.', curpos)
+        else
+            call winrestview(s:stateSaved)
         endif
+    else
+        call winrestview(s:stateSaved)
     endif
 
     if s:hlsearchSaved && !empty(pattern)
@@ -126,7 +130,7 @@ function! s:cmdParse(cmdline)
     if len(items) < 2
         return {}
     endif
-    let modes = get(g:, 'eregex_incsearch_modes', get(b:, 'eregex_incsearch_modes', 'MSGV'))
+    let modes = get(b:, 'eregex_incsearch_modes', get(g:, 'eregex_incsearch_modes', 'MSGV'))
     " ^[0-9,\.\$%]*([MSGV])\/.*$
     let method = substitute(items[0], '^[0-9,\.\$%]*\([' . modes . ']\)\/.*$', '\1', '')
     if empty(method)