diff options
| -rw-r--r-- | runtime/filetype.vim | 2 | ||||
| -rw-r--r-- | src/testdir/test_filetype.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index aa66bead32..567c0a3e95 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1509,7 +1509,7 @@ au BufNewFile,BufRead *.nmconnection setf confini " Pacman hooks au BufNewFile,BufRead *.hook \ if getline(1) == '[Trigger]' | - \ setf conf | + \ setf confini | \ endif " Pam conf diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index 6b049afa9b..1df8237186 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -1480,12 +1480,12 @@ func Test_hook_file() call writefile(['[Trigger]', 'this is pacman config'], 'Xfile.hook', 'D') split Xfile.hook - call assert_equal('conf', &filetype) + call assert_equal('confini', &filetype) bwipe! call writefile(['not pacman'], 'Xfile.hook') split Xfile.hook - call assert_notequal('conf', &filetype) + call assert_notequal('confini', &filetype) bwipe! filetype off diff --git a/src/version.c b/src/version.c index 67f39f28f0..3389927fa5 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2063, +/**/ 2062, /**/ 2061, |