Commit: patch 9.1.0245: filetype: zsh theme, history and zunit files are not recognized

6 views
Skip to first unread message

Christian Brabandt

unread,
Mar 31, 2024, 1:45:10 PM3/31/24
to vim...@googlegroups.com
patch 9.1.0245: filetype: zsh theme, history and zunit files are not recognized

Commit: https://github.com/vim/vim/commit/a55a22a1a30f8f37633ed78ea25a393d11e250f2
Author: Wu, Zhenyu <wuzh...@ustc.edu>
Date: Sun Mar 31 19:42:39 2024 +0200

patch 9.1.0245: filetype: zsh theme, history and zunit files are not recognized

Problem: filetype: zsh theme, history and zunit files are not
recognized.
Solution: Detect '.zsh_history', '*.zsh-theme' and '*.zunit' as zsh
(Wu, Zhenyu)

closes: #14366

Signed-off-by: Wu, Zhenyu <wuzh...@ustc.edu>
Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index e1d773258..fe450b8b1 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -2047,8 +2047,8 @@ 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
-au BufNewFile,BufRead *.zsh setf zsh
+au BufNewFile,BufRead .zshrc,.zshenv,.zlogin,.zlogout,.zcompdump,.zsh_history setf zsh
+au BufNewFile,BufRead *.zsh,*.zsh-theme,*.zunit setf zsh

" Scheme ("racket" patterns are now separate, see above)
au BufNewFile,BufRead *.scm,*.ss,*.sld setf scheme
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index a1f7e2221..f3cc93902 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -828,8 +828,8 @@ def s:GetFilenameChecks(): dict<list<string>>
zimbu: ['file.zu'],
zimbutempl: ['file.zut'],
zserio: ['file.zs'],
- zsh: ['.zprofile', '/etc/zprofile', '.zfbfmarks', 'file.zsh',
- '.zcompdump', '.zlogin', '.zlogout', '.zshenv', '.zshrc',
+ zsh: ['.zprofile', '/etc/zprofile', '.zfbfmarks', 'file.zsh', 'file.zsh-theme', 'file.zunit',
+ '.zcompdump', '.zlogin', '.zlogout', '.zshenv', '.zshrc', '.zsh_history',
'.zcompdump-file', '.zlog', '.zlog-file', '.zsh', '.zsh-file',
'any/etc/zprofile', 'zlog', 'zlog-file', 'zsh', 'zsh-file'],

diff --git a/src/version.c b/src/version.c
index a6755acaa..490812988 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 245,
/**/
244,
/**/
Reply all
Reply to author
Forward
0 new messages