Merge pull request #417 from lambdalisue/fix-winfixwidth

Automatically set `nowinfixwidth` when there is only one window
lambdalisue · Apr 14, 2022 · 3000ce2 · 3000ce2
2 parents 1237977 + b940770
commit 3000ce2
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 30 deletions.
diff --git a/autoload/fern.vim b/autoload/fern.vim
@@ -31,7 +31,6 @@ call s:Config.config(expand('<sfile>:p'), {
       \ 'disable_drawer_hover_popup': 0,
       \ 'disable_drawer_tabpage_isolation': 0,
       \ 'disable_drawer_auto_restore_focus': 0,
-      \ 'disable_drawer_auto_restore_winfixwidth': 0,
       \ 'default_hidden': 0,
       \ 'default_include': '',
       \ 'default_exclude': '',

diff --git a/autoload/fern/internal/drawer.vim b/autoload/fern/internal/drawer.vim
@@ -50,7 +50,6 @@ function! fern#internal#drawer#init() abort
   call fern#internal#drawer#auto_resize#init()
   call fern#internal#drawer#auto_winfixwidth#init()
   call fern#internal#drawer#auto_restore_focus#init()
-  call fern#internal#drawer#auto_restore_winfixwidth#init()
   call fern#internal#drawer#smart_quit#init()
   call fern#internal#drawer#hover_popup#init()
   call fern#internal#drawer#resize()

diff --git a/autoload/fern/internal/drawer/auto_restore_winfixwidth.vim b/autoload/fern/internal/drawer/auto_restore_winfixwidth.vim
diff --git a/autoload/fern/internal/drawer/auto_winfixwidth.vim b/autoload/fern/internal/drawer/auto_winfixwidth.vim
@@ -5,6 +5,10 @@ function! fern#internal#drawer#auto_winfixwidth#init() abort
 
   augroup fern_internal_drawer_auto_winfixwidth_init
     autocmd! * <buffer>
-    autocmd BufEnter <buffer> setlocal winfixwidth
+    autocmd BufEnter <buffer> call s:set_winfixwidth()
   augroup END
 endfunction
+
+function! s:set_winfixwidth() abort
+  let &l:winfixwidth = winnr('$') isnot# 1
+endfunction
diff --git a/doc/fern.txt b/doc/fern.txt
@@ -401,7 +401,9 @@ VARIABLE						*fern-variable*
 
 *g:fern#disable_drawer_auto_winfixwidth*
 	Set 1 to disable automatically enable 'winfixwidth' to drawer on
-	|BufEnter| autocmd.
+	|BufEnter| autocmd. Note that it automatically set 'nowinfixwidth' on
+	the autocmd when there is only one window.
+
 	Default: 0
 
 *g:fern#disable_drawer_auto_resize*
@@ -500,12 +502,6 @@ VARIABLE						*fern-variable*
 <
 	Default: 0 
 
-*g:fern#disable_drawer_auto_restore_winfixwidth*
-	Set 1 to disable automatically restore 'winfixwidth' on |BufWinLeave|
-	autocmd.
-
-	Default: 0
-
 *g:fern#default_hidden*
 	Set 1 to enter hidden mode (show hidden files) in default.
 	Default: 0