diff --git a/runtime/filetype.vim b/runtime/filetype.vim index be59bc0d5..c06a05629 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -2436,7 +2436,7 @@ au BufNewFile,BufRead *.tape setf vhs au BufNewFile,BufRead *.hdl,*.vhd,*.vhdl,*.vbe,*.vst,*.vho setf vhdl " Vim script -au BufNewFile,BufRead *.vim,.exrc,_exrc setf vim +au BufNewFile,BufRead *.vim,.exrc,_exrc,.netrwhist setf vim " Viminfo file au BufNewFile,BufRead .viminfo,_viminfo setf viminfo diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index 91fc51718..c4a57a090 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -785,7 +785,7 @@ def s:GetFilenameChecks(): dict> vgrindefs: ['vgrindefs'], vhdl: ['file.hdl', 'file.vhd', 'file.vhdl', 'file.vbe', 'file.vst', 'file.vhdl_123', 'file.vho', 'some.vhdl_1', 'some.vhdl_1-file'], vhs: ['file.tape'], - vim: ['file.vim', '.exrc', '_exrc', 'some-vimrc', 'some-vimrc-file', 'vimrc', 'vimrc-file'], + vim: ['file.vim', '.exrc', '_exrc', 'some-vimrc', 'some-vimrc-file', 'vimrc', 'vimrc-file', '.netrwhist'], viminfo: ['.viminfo', '_viminfo'], vmasm: ['file.mar'], voscm: ['file.cm'], diff --git a/src/version.c b/src/version.c index f236655fe..b89c6c874 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 243, /**/ 242, /**/