summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 54bc7a55f4..6fef4b77a7 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -818,6 +818,9 @@ au BufNewFile,BufRead *.gleam setf gleam
" GLSL
au BufNewFile,BufRead *.glsl setf glsl
+" GN (generate ninja) files
+au BufNewFile,BufRead *.gn,*.gni setf gn
+
" GP scripts (2.0 and onward)
au BufNewFile,BufRead *.gp,.gprc setf gp
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index ce4d5ea2cf..bfaab514eb 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -277,6 +277,7 @@ def s:GetFilenameChecks(): dict<list<string>>
gkrellmrc: ['gkrellmrc', 'gkrellmrc_x'],
gleam: ['file.gleam'],
glsl: ['file.glsl'],
+ gn: ['file.gn', 'file.gni'],
gnash: ['gnashrc', '.gnashrc', 'gnashpluginrc', '.gnashpluginrc'],
gnuplot: ['file.gpi', '.gnuplot'],
go: ['file.go'],
diff --git a/src/version.c b/src/version.c
index 8f0a9c3ba5..37a31fdace 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 */
/**/
+ 2060,
+/**/
2059,
/**/
2058,