fix to restore highlight with <ESC> #74

haya14busa · May 1, 2015 · 5cbb059 · 5cbb059
1 parent c8123f5
commit 5cbb059
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/autoload/incsearch.vim b/autoload/incsearch.vim
@@ -165,15 +165,18 @@ function! s:pattern_saver.on_enter(cmdline) abort
   if ! g:incsearch#no_inc_hlsearch
     let self.pattern = @/
     let self.hlsearch = &hlsearch
-    set hlsearch | nohlsearch
     if exists('v:hlsearch')
       let self.vhlsearch = v:hlsearch
     endif
+    set hlsearch | nohlsearch
   endif
 endfunction
 function! s:pattern_saver.on_leave(cmdline) abort
-  if ! g:incsearch#no_inc_hlsearch && a:cmdline.exit_code()
-    let @/ = self.pattern
+  if ! g:incsearch#no_inc_hlsearch
+    let is_cancel = a:cmdline.exit_code()
+    if is_cancel
+      let @/ = self.pattern
+    endif
     let &hlsearch = self.hlsearch
     if exists('v:hlsearch')
       let v:hlsearch = self.vhlsearch