aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Clason <c.clason@uni-graz.at>2024-03-31 19:44:40 +0200
committerChristian Clason <c.clason@uni-graz.at>2024-04-01 12:01:47 +0200
commitfa863c17b27f92f840b88b58c88e6479f70ac3c6 (patch)
tree6f654763f8ddcb24ca70456b969453bdbedd796e
parent239101e32afbbaef679b1c310bbbee65c57141a2 (diff)
downloadrneovim-fa863c17b27f92f840b88b58c88e6479f70ac3c6.tar.gz
rneovim-fa863c17b27f92f840b88b58c88e6479f70ac3c6.tar.bz2
rneovim-fa863c17b27f92f840b88b58c88e6479f70ac3c6.zip
vim-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: vim/vim#14366 https://github.com/vim/vim/commit/a55a22a1a30f8f37633ed78ea25a393d11e250f2 Co-authored-by: Wu, Zhenyu <wuzhenyu@ustc.edu>
-rw-r--r--runtime/lua/vim/filetype.lua3
-rw-r--r--test/old/testdir/test_filetype.vim3
2 files changed, 4 insertions, 2 deletions
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index a1ce5f1edf..6dc0391404 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1155,6 +1155,8 @@ local extension = {
zut = 'zimbutempl',
zs = 'zserio',
zsh = 'zsh',
+ zunit = 'zsh',
+ ['zsh-theme'] = 'zsh',
vala = 'vala',
web = detect.web,
pl = detect.pl,
@@ -1573,6 +1575,7 @@ local filename = {
['.zshrc'] = 'zsh',
['.zprofile'] = 'zsh',
['.zcompdump'] = 'zsh',
+ ['.zsh_history'] = 'zsh',
['.zshenv'] = 'zsh',
['.zfbfmarks'] = 'zsh',
-- END FILENAME
diff --git a/test/old/testdir/test_filetype.vim b/test/old/testdir/test_filetype.vim
index c0ab747274..3611fafbf2 100644
--- a/test/old/testdir/test_filetype.vim
+++ b/test/old/testdir/test_filetype.vim
@@ -750,8 +750,7 @@ func s:GetFilenameChecks() abort
\ 'zimbu': ['file.zu'],
\ 'zimbutempl': ['file.zut'],
\ 'zserio': ['file.zs'],
- \ 'zsh': ['.zprofile', '/etc/zprofile', '.zfbfmarks', 'file.zsh', '.zcompdump', '.zlogin', '.zlogout', '.zshenv', '.zshrc', '.zcompdump-file', '.zlog', '.zlog-file', '.zsh', '.zsh-file', 'any/etc/zprofile', 'zlog', 'zlog-file', 'zsh', 'zsh-file'],
- \
+ \ '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'],
\ 'help': [$VIMRUNTIME . '/doc/help.txt'],
\ }
endfunc