summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorObserverOfTime <chronobserver@disroot.org>2022-09-27 11:35:09 +0100
committerBram Moolenaar <Bram@vim.org>2022-09-27 11:35:09 +0100
commitd32474229213276c64cb293885a975dcb406fbc9 (patch)
treeb369cbd6b5e99e7893e4769da48052b9a507fb63
parentcde031938537970938437cdbb235bc0da755ae4a (diff)
downloadvim-git-d32474229213276c64cb293885a975dcb406fbc9.tar.gz
patch 9.0.0600: GYP files are not recognizedv9.0.0600
Problem: GYP files are not recognized. Solution: Recognize GYP files. (closes #11242)
-rw-r--r--runtime/filetype.vim3
-rw-r--r--src/testdir/test_filetype.vim1
-rw-r--r--src/version.c2
3 files changed, 6 insertions, 0 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index c301b0e5b..a5ac81262 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -802,6 +802,9 @@ au BufNewFile,BufRead */etc/group,*/etc/group-,*/etc/group.edit,*/etc/gshadow,*/
" GTK RC
au BufNewFile,BufRead .gtkrc,gtkrc setf gtkrc
+" GYP
+au BufNewFile,BufRead *.gyp,*.gypi setf gyp
+
" Hack
au BufRead,BufNewFile *.hack,*.hackpartial setf hack
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 43f96647a..ad77df357 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -240,6 +240,7 @@ let s:filename_checks = {
\ 'grub': ['/boot/grub/menu.lst', '/boot/grub/grub.conf', '/etc/grub.conf', 'any/boot/grub/grub.conf', 'any/boot/grub/menu.lst', 'any/etc/grub.conf'],
\ 'gsp': ['file.gsp'],
\ 'gtkrc': ['.gtkrc', 'gtkrc', '.gtkrc-file', 'gtkrc-file'],
+ \ 'gyp': ['file.gyp', 'file.gypi'],
\ 'hack': ['file.hack', 'file.hackpartial'],
\ 'haml': ['file.haml'],
\ 'hamster': ['file.hsm'],
diff --git a/src/version.c b/src/version.c
index bfc057b8f..d0e14a203 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 600,
+/**/
599,
/**/
598,