unmanaged-vim-plug/fuzzyfinder/autoload/fuf.vim

@@ -706,11 +706,6 @@ let s:FUF_BUF_NAME = '[fuf]'
 
 "
 function s:activateFufBuffer()
-  " Save the last window number so we can switch back to it later (otherwise,
-  " at least with more recent versions of Vim, we end up with the top left
-  " window focused)
-  let s:fuf_buffer_last_winnr = winnr()
-
   " lcd . : To avoid the strange behavior that unnamed buffer changes its cwd
   "         if 'autochdir' was set on.
   lcd .
@@ -738,7 +733,6 @@ function s:deactivateFufBuffer()
     AutoComplPopUnlock
   endif
   call l9#tempbuffer#close(s:FUF_BUF_NAME)
-  exec s:fuf_buffer_last_winnr . "wincmd w"
 endfunction
 
 " }}}1

unmanaged-vim-plug/fuzzyfinder/fd41e8d68b6774324b58c02692b896a6a36a0397.patch

@@ -1,36 +0,0 @@
-From fd41e8d68b6774324b58c02692b896a6a36a0397 Mon Sep 17 00:00:00 2001
-From: David Wolever <david@wolever.net>
-Date: Thu, 1 Jun 2017 10:11:43 -0400
-Subject: [PATCH] Fix focus top left window bug
-
-With newer versions of Vim, the top left window will be focused after
-opening the fuf menu. This patch restores the window focus after the
-menu is closed.
----
- autoload/fuf.vim | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/autoload/fuf.vim b/autoload/fuf.vim
-index fe9e6eb..78be490 100644
---- a/autoload/fuf.vim
-+++ b/autoload/fuf.vim
-@@ -706,6 +706,11 @@ let s:FUF_BUF_NAME = '[fuf]'
- 
- "
- function s:activateFufBuffer()
-+  " Save the last window number so we can switch back to it later (otherwise,
-+  " at least with more recent versions of Vim, we end up with the top left
-+  " window focused)
-+  let s:fuf_buffer_last_winnr = winnr()
-+
-   " lcd . : To avoid the strange behavior that unnamed buffer changes its cwd
-   "         if 'autochdir' was set on.
-   lcd .
-@@ -733,6 +738,7 @@ function s:deactivateFufBuffer()
-     AutoComplPopUnlock
-   endif
-   call l9#tempbuffer#close(s:FUF_BUF_NAME)
-+  exec s:fuf_buffer_last_winnr . "wincmd w"
- endfunction
- 
- " }}}1

vimrc

@@ -44,9 +44,14 @@ Plug 'tpope/vim-rhubarb'
 Plug 'sjbach/lusty'
 if has("nvim")
 	Plug 'iCyMind/NeoSolarized'
+	Plug 'vim-airline/vim-airline'
+else
+	Plug 'powerline/powerline', {
+		\ 'branch': 'develop',
+		\ 'do': 'python3 setup.py install --user',
+		\ 'rtp': 'powerline/bindings/vim',
+		\ }
 endif
-Plug 'vim-airline/vim-airline'
-Plug 'vim-airline/vim-airline-themes'
 
 " local_vimrc
 Plug 'LucHermitte/lh-vim-lib'
@@ -189,10 +194,6 @@ endif
 let g:neosnippet#enable_snipmate_compatibility = 1
 
 
-" vim airline
-" let g:airline#extensions#tabline#enabled = 1
-
-
 " LSP
 let g:LanguageClient_autoStart = 0