Merge pull request #186 from lambdalisue/fix-cursor-issues

Fix cursor issues
lambdalisue · Aug 31, 2020 · 72be136 · 72be136
2 parents 9e5aab0 + 2b3a601
commit 72be136
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/autoload/fern/internal/viewer.vim b/autoload/fern/internal/viewer.vim
@@ -59,7 +59,7 @@ function! s:init() abort
     if !g:fern#disable_viewer_hide_cursor
       autocmd BufEnter,WinEnter,CmdwinLeave,CmdlineLeave <buffer> setlocal cursorline
       autocmd BufEnter,WinEnter,CmdwinLeave,CmdlineLeave <buffer> call fern#internal#cursor#hide()
-      autocmd BufLeave,WinLeave,CmdwinEnter,CmdlineEnter <buffer> call fern#internal#cursor#restore()
+      autocmd BufLeave,WinLeave,CmdwinEnter,CmdlineEnter,VimLeave <buffer> call fern#internal#cursor#restore()
     endif
   augroup END
 

diff --git a/ftplugin/fern.vim b/ftplugin/fern.vim
@@ -5,3 +5,10 @@ let b:did_ftplugin = 1
 
 setlocal cursorline
 setlocal nolist nowrap nospell
+
+" Do NOT allow cursorlineopt=number while fern.vim hide cursor on
+" its buffer unless g:fern#disable_viewer_hide_cursor has specified
+" Fix #182
+if exists('+cursorlineopt') && !g:fern#disable_viewer_hide_cursor
+  setlocal cursorlineopt=number,line
+endif