summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGuido Cella <guido@guidocella.xyz>2023-10-23 19:27:06 +0200
committerChristian Brabandt <cb@256bit.org>2023-10-23 19:27:06 +0200
commit7d254dbc2db35badc65668db85f826f605486986 (patch)
tree1f1ebb2b63b2ef68ad980a4cf542d1dba870ad9f /src
parentc038427d2a27445e612761f19c92b2b8b05afdea (diff)
patch 9.0.2063: pacman hooks are detected as conf filetypev9.0.2063
Problem: pacman hooks are detected as conf filetype Solution: make it consistent to pacman.conf and detect those hooks as confini Because confini has much better syntax highlighting than conf. For reference, I identified pacman.conf and pacman hooks as dosini in https://github.com/vim/vim/pull/6335, then https://github.com/vim/vim/pull/10213 changed them to conf, then https://github.com/vim/vim/pull/10518 changed pacman.conf to confini but forgot to change hooks. closes: #13399 Signed-off-by: Christian Brabandt <cb@256bit.org> Co-authored-by: Guido Cella <guido@guidocella.xyz>
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test_filetype.vim4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
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,