Commit: patch 9.1.0960: filetype: hy history files are not recognized

[Christian Brabandt]

patch 9.1.0960: filetype: hy history files are not recognized

Commit: https://github.com/vim/vim/commit/a32daed55933df49a7aed571cc6e400ae01c7976
Author: Wu, Zhenyu <wuzh...@ustc.edu>
Date: Wed Dec 25 10:33:57 2024 +0100

patch 9.1.0960: filetype: hy history files are not recognized

Problem: filetype: hy history files are not recognized
Solution: detect '*.hy', '.hy-history' files as hy filetype,
detect '.lips_repl_history' files are scheme filetype
(Wu, Zhenyu)

closes: #16298

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 3eb173646..78a44f572 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1109,6 +1109,9 @@ au BufNewFile,BufRead */etc/hosts.allow,*/etc/hosts.deny setf hostsaccess
" Hurl
au BufRead,BufNewFile *.hurl setf hurl

+" Hy
+au BufRead,BufNewFile *.hy,.hy-history setf hy
+
" Hyper Builder
au BufNewFile,BufRead *.hb setf hb

@@ -2314,8 +2317,8 @@ au BufNewFile,BufRead *.zsh,*.zsh-theme,*.zunit setf zsh
" Salt state files
au BufNewFile,BufRead *.sls setf salt

-" Scheme, Supertux configuration ("racket" patterns are now separate, see above)
-au BufNewFile,BufRead *.scm,*.ss,*.sld,*.stsg,*/supertux2/config setf scheme
+" Scheme, Supertux configuration, Lips.js history ("racket" patterns are now separate, see above)
+au BufNewFile,BufRead *.scm,*.ss,*.sld,*.stsg,*/supertux2/config,.lips_repl_history setf scheme

" Screen RC
au BufNewFile,BufRead .screenrc,screenrc setf screen
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 20a11ae43..bb9cbbeb0 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -357,6 +357,7 @@ def s:GetFilenameChecks(): dict<list<string>>
htmlm4: ['file.html.m4'],
httest: ['file.htt', 'file.htb'],
hurl: ['file.hurl'],
+ hy: ['file.hy', '.hy-history'],
hyprlang: ['hyprlock.conf', 'hyprland.conf', 'hypridle.conf', 'hyprpaper.conf', '/hypr/foo.conf'],
i3config: ['/home/user/.i3/config', '/home/user/.config/i3/config', '/etc/i3/config', '/etc/xdg/i3/config'],
ibasic: ['file.iba', 'file.ibi'],
@@ -671,7 +672,7 @@ def s:GetFilenameChecks(): dict<list<string>>
sather: ['file.sa'],
sbt: ['file.sbt'],
scala: ['file.scala'],
- scheme: ['file.scm', 'file.ss', 'file.sld', 'file.stsg', 'any/local/share/supertux2/config'],
+ scheme: ['file.scm', 'file.ss', 'file.sld', 'file.stsg', 'any/local/share/supertux2/config', '.lips_repl_history'],
scilab: ['file.sci', 'file.sce'],
screen: ['.screenrc', 'screenrc'],
scss: ['file.scss'],
diff --git a/src/version.c b/src/version.c
index 9f2d5fe3d..632b5590a 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 */
+/**/
+ 960,
/**/
959,
/**/