diff options
| -rw-r--r-- | runtime/autoload/netrw.vim | 13 | ||||
| -rw-r--r-- | runtime/lua/vim/filetype.lua | 3 | ||||
| -rw-r--r-- | test/old/testdir/test_filetype.vim | 1 |
3 files changed, 15 insertions, 2 deletions
diff --git a/runtime/autoload/netrw.vim b/runtime/autoload/netrw.vim index 2ed3e9ca39..dcaa075608 100644 --- a/runtime/autoload/netrw.vim +++ b/runtime/autoload/netrw.vim @@ -3469,6 +3469,11 @@ fun! s:NetrwBookHistHandler(chg,curdir) echo "bookmarked the current directory" endif + try + call s:NetrwBookHistSave() + catch + endtry + elseif a:chg == 1 " change to the bookmarked directory " call Decho("(user: <".v:count."gb>) change to the bookmarked directory",'~'.expand("<slnum>")) @@ -3613,6 +3618,11 @@ fun! s:NetrwBookHistHandler(chg,curdir) " call Decho("g:netrw_bookmarklist=".string(g:netrw_bookmarklist),'~'.expand("<slnum>")) endif " call Decho("resulting g:netrw_bookmarklist=".string(g:netrw_bookmarklist),'~'.expand("<slnum>")) + + try + call s:NetrwBookHistSave() + catch + endtry endif call s:NetrwBookmarkMenu() call s:NetrwTgtMenu() @@ -7322,8 +7332,7 @@ fun! s:NetrwMarkFileDiff(islocal) exe "NetrwKeepj e ".fnameescape(fname) diffthis elseif cnt == 2 || cnt == 3 - vsplit - wincmd l + below vsplit " call Decho("diffthis: ".fname,'~'.expand("<slnum>")) exe "NetrwKeepj e ".fnameescape(fname) diffthis diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua index 5ae4e508ef..c412364461 100644 --- a/runtime/lua/vim/filetype.lua +++ b/runtime/lua/vim/filetype.lua @@ -565,6 +565,7 @@ local extension = { libsonnet = 'jsonnet', jsp = 'jsp', jl = 'julia', + just = 'just', kdl = 'kdl', kv = 'kivy', kix = 'kix', @@ -1331,6 +1332,7 @@ local filename = { ['.jsfmtrc'] = 'jsonc', ['.jshintrc'] = 'jsonc', ['.swrc'] = 'jsonc', + ['.justfile'] = 'just', Kconfig = 'kconfig', ['Kconfig.debug'] = 'kconfig', ['lftp.conf'] = 'lftp', @@ -1715,6 +1717,7 @@ local pattern = { ['org%.eclipse%..*%.prefs'] = 'jproperties', ['.*%.properties_.._.._.*'] = starsetf('jproperties'), ['[jt]sconfig.*%.json'] = 'jsonc', + ['[jJ]ustfile'] = 'just', ['Kconfig%..*'] = starsetf('kconfig'), ['.*%.[Ss][Uu][Bb]'] = 'krl', ['lilo%.conf.*'] = starsetf('lilo'), diff --git a/test/old/testdir/test_filetype.vim b/test/old/testdir/test_filetype.vim index e5d7085d71..c3002b6747 100644 --- a/test/old/testdir/test_filetype.vim +++ b/test/old/testdir/test_filetype.vim @@ -340,6 +340,7 @@ func s:GetFilenameChecks() abort \ 'jsonnet': ['file.jsonnet', 'file.libsonnet'], \ 'jsp': ['file.jsp'], \ 'julia': ['file.jl'], + \ 'just': ['justfile', 'Justfile', '.justfile', 'config.just'], \ 'kconfig': ['Kconfig', 'Kconfig.debug', 'Kconfig.file'], \ 'kdl': ['file.kdl'], \ 'kivy': ['file.kv'], |