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 9daf5a3cbb..aa33b6529a 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1961,6 +1961,9 @@ au BufNewFile,BufRead .login,.cshrc,csh.cshrc,csh.login,csh.logout,*.csh,.alias
au BufNewFile,BufRead *.zig setf zig
au BufNewFile,BufRead *.zir setf zir
+" Zserio
+au BufNewFile,BufRead *.zs setf zserio
+
" Z-Shell script (patterns ending in a star further below)
au BufNewFile,BufRead .zprofile,*/etc/zprofile,.zfbfmarks setf zsh
au BufNewFile,BufRead .zshrc,.zshenv,.zlogin,.zlogout,.zcompdump setf zsh
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 8a38fb756e..a704fb624a 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -801,6 +801,7 @@ def s:GetFilenameChecks(): dict<list<string>>
zimbu: ['file.zu'],
zimbutempl: ['file.zut'],
zir: ['file.zir'],
+ zserio: ['file.zs'],
zsh: ['.zprofile', '/etc/zprofile', '.zfbfmarks', 'file.zsh',
'.zcompdump', '.zlogin', '.zlogout', '.zshenv', '.zshrc',
'.zcompdump-file', '.zlog', '.zlog-file', '.zsh', '.zsh-file',
diff --git a/src/version.c b/src/version.c
index 5ad3b34109..14ede7f3a6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1645,
+/**/
1644,
/**/
1643,