Merge remote-tracking branch 'upstream/master'

benbarbour · Jul 31, 2019 · 4e9d9a3 · 4e9d9a3
2 parents 89254a0 + 359a80e
commit 4e9d9a3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -154,7 +154,7 @@ let g:skim_layout = { 'down': '~40%' }
 " In Neovim, you can set up fzf window using a Vim command
 let g:skim_layout = { 'window': 'enew' }
 let g:skim_layout = { 'window': '-tabnew' }
-let g:skim_layout = { 'window': '10split' }
+let g:skim_layout = { 'window': '10new' }
 
 " Customize fzf colors to match your color scheme
 let g:skim_colors =

diff --git a/autoload/fzf/vim.vim b/autoload/fzf/vim.vim
@@ -485,7 +485,7 @@ function! s:history_sink(type, lines)
   if key == 'ctrl-e'
     call histadd(a:type, item)
     redraw
-    call feedkeys(a:type."\<up>")
+    call feedkeys(a:type."\<up>", 'n')
   else
     if a:type == ':'
       call histadd(a:type, item)
@@ -841,7 +841,7 @@ function! s:tags_sink(lines)
         let relpath = parts[1][:-2]
         let abspath = relpath =~ (s:is_win ? '^[A-Z]:\' : '^/') ? relpath : join([base, relpath], '/')
         call s:open(cmd, expand(abspath, 1))
-        execute excmd
+        silent execute excmd
         call add(qfl, {'filename': expand('%'), 'lnum': line('.'), 'text': getline('.')})
       catch /^Vim:Interrupt$/
         break

diff --git a/doc/fzf-vim.txt b/doc/fzf-vim.txt
@@ -1,4 +1,4 @@
-fzf-vim.txt	fzf-vim	Last change: August 31 2018
+*fzf-vim.txt*	fzf-vim	Last change: August 31 2018
 FZF-VIM - TABLE OF CONTENTS                                *fzf-vim* *fzf-vim-toc*
 ==============================================================================
 
@@ -164,7 +164,7 @@ See {README-VIM.md}{4} of the main fzf repository for details.
     " In Neovim, you can set up fzf window using a Vim command
     let g:skim_layout = { 'window': 'enew' }
     let g:skim_layout = { 'window': '-tabnew' }
-    let g:skim_layout = { 'window': '10split' }
+    let g:skim_layout = { 'window': '10new' }
 
     " Customize fzf colors to match your color scheme
     let g:skim_colors =