Merge pull request #305 from lambdalisue/fix-nested

Try to support old Vim

Author: lambdalisue

.github/workflows/neovim.yml

@@ -19,7 +19,7 @@ jobs:
           - ubuntu-latest
         version:
           - stable
-          - v0.4.3
+          - v0.4.4
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2

.github/workflows/vim.yml

@@ -19,8 +19,8 @@ jobs:
           - ubuntu-latest
         version:
           - nightly
-          - v8.2.0235
-          - v8.1.2424
+          - v8.2.0716   # Ubuntu 20.10 (2021/02/28)
+          - v8.1.2269   # Ubuntu 20.04 (2021/02/28)
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2

README.md

@@ -1,7 +1,7 @@
 # 🌿 fern.vim
 
-![Support Vim 8.1 or above](https://img.shields.io/badge/support-Vim%208.1%20or%20above-yellowgreen.svg)
-![Support Neovim 0.4 or above](https://img.shields.io/badge/support-Neovim%200.4%20or%20above-yellowgreen.svg)
+![Support Vim 8.1.2269 or above](https://img.shields.io/badge/support-Vim%208.1.2269%20or%20above-yellowgreen.svg)
+![Support Neovim 0.4.4 or above](https://img.shields.io/badge/support-Neovim%200.4.4%20or%20above-yellowgreen.svg)
 [![Powered by vital.vim](https://img.shields.io/badge/powered%20by-vital.vim-80273f.svg)](https://github.com/vim-jp/vital.vim)
 [![Powered by vital-Whisky](https://img.shields.io/badge/powered%20by-vital--Whisky-80273f.svg)](https://github.com/lambdalisue/vital-Whisky)
 [![MIT License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)

autoload/fern/helper.vim

@@ -7,7 +7,7 @@ function! fern#helper#new(...) abort
   let helper = extend({
         \ 'fern': fern,
         \ 'bufnr': bufnr,
-        \ 'winid': bufnr() == bufnr ? win_getid() : bufwinid(bufnr),
+        \ 'winid': bufnr('%') == bufnr ? win_getid() : bufwinid(bufnr),
         \}, s:helper)
   let helper.sync = fern#helper#sync#new(helper)
   let helper.async = fern#helper#async#new(helper)

autoload/fern/internal/drawer/auto_restore_focus.vim

@@ -32,5 +32,5 @@ endfunction
 
 augroup fern_internal_drawer_auto_restore_focus
   autocmd!
-  autocmd WinEnter * ++nested call s:auto_restore_focus()
+  autocmd WinEnter * nested call s:auto_restore_focus()
 augroup END

autoload/fern/internal/drawer/smart_quit.vim

@@ -7,7 +7,7 @@ function! fern#internal#drawer#smart_quit#init() abort
 
   augroup fern_internal_drawer_smart_quit_init
     autocmd! * <buffer>
-    autocmd BufEnter <buffer> ++nested call s:smart_quit()
+    autocmd BufEnter <buffer> nested call s:smart_quit()
   augroup END
 endfunction
 

autoload/fern/internal/spinner.vim

@@ -19,7 +19,7 @@ endfunction
 
 function! s:update(timer, spinner, bufnr) abort
   let fern = getbufvar(a:bufnr, 'fern', v:null)
-  let winid = bufnr() == a:bufnr ? win_getid() : bufwinid(a:bufnr)
+  let winid = bufnr('%') == a:bufnr ? win_getid() : bufwinid(a:bufnr)
   if fern is# v:null || winid is# -1
     call timer_stop(a:timer)
     return

autoload/fern/internal/viewer.vim

@@ -52,7 +52,7 @@ function! s:init() abort
   augroup fern_internal_viewer_init
     autocmd! * <buffer>
     autocmd BufEnter <buffer> setlocal nobuflisted
-    autocmd BufReadCmd <buffer> ++nested call s:BufReadCmd()
+    autocmd BufReadCmd <buffer> nested call s:BufReadCmd()
     autocmd ColorScheme <buffer> call s:ColorScheme()
     autocmd CursorMoved,CursorMovedI,BufLeave <buffer> let b:fern_cursor = getcurpos()[1:2]
   augroup END

autoload/fern/internal/viewer/auto_duplication.vim

@@ -5,7 +5,7 @@ function! fern#internal#viewer#auto_duplication#init() abort
 
   augroup fern_internal_viewer_auto_duplication_init
     autocmd! * <buffer>
-    autocmd WinEnter <buffer> ++nested call s:duplicate()
+    autocmd WinEnter <buffer> nested call s:duplicate()
   augroup END
 endfunction
 

plugin/fern.vim

@@ -1,4 +1,8 @@
-if exists('g:loaded_fern') || ( !has('nvim') && v:version < 801 )
+if exists('g:loaded_fern') || (!has('nvim') && !has('patch-8.1.0994'))
+  " NOTE:
+  " At least https://github.com/vim/vim/releases/tag/v8.1.0994 is required
+  " thus minimum working version is 8.1.0994. Remember that minimum support
+  " version is not equal to this.
   finish
 endif
 let g:loaded_fern = 1
@@ -24,6 +28,6 @@ endfunction
 
 augroup fern_internal
   autocmd! *
-  autocmd BufReadCmd fern://* ++nested call s:BufReadCmd()
-  autocmd SessionLoadPost fern://* ++nested call s:BufReadCmd()
+  autocmd BufReadCmd fern://* nested call s:BufReadCmd()
+  autocmd SessionLoadPost fern://* nested call s:BufReadCmd()
 augroup END