From 41a6026f007facb1ada3ff2a63a054913432860c Mon Sep 17 00:00:00 2001 From: David Mandelberg Date: Fri, 21 Feb 2025 20:13:54 +0100 Subject: [PATCH] patch 9.1.1134: filetype: Guile init file not recognized Problem: filetype: Guile init file not recognized Solution: detect '.guile' file as scheme filetype (David Mandelberg) References: https://www.gnu.org/software/guile/manual/html_node/Init-File.html > When run interactively, Guile will load a local initialization file > from ~/.guile. This file should contain Scheme expressions for > evaluation. closes: #16683 Signed-off-by: David Mandelberg Signed-off-by: Christian Brabandt --- runtime/filetype.vim | 4 ++-- src/testdir/test_filetype.vim | 2 +- src/version.c | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/runtime/filetype.vim b/runtime/filetype.vim index b4207942ea..0acd187181 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -2347,8 +2347,8 @@ au BufNewFile,BufRead *.zsh,*.zsh-theme,*.zunit setf zsh " Salt state files au BufNewFile,BufRead *.sls setf salt -" 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 +" Scheme, Supertux configuration, Lips.js history, Guile init file ("racket" patterns are now separate, see above) +au BufNewFile,BufRead *.scm,*.ss,*.sld,*.stsg,*/supertux2/config,.lips_repl_history,.guile 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 6fe383d871..3196856c03 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -675,7 +675,7 @@ def s:GetFilenameChecks(): dict> sass: ['file.sass'], sbt: ['file.sbt'], scala: ['file.scala', 'file.mill'], - scheme: ['file.scm', 'file.ss', 'file.sld', 'file.stsg', 'any/local/share/supertux2/config', '.lips_repl_history'], + scheme: ['file.scm', 'file.ss', 'file.sld', 'file.stsg', 'any/local/share/supertux2/config', '.lips_repl_history', '.guile'], scilab: ['file.sci', 'file.sce'], screen: ['.screenrc', 'screenrc'], scss: ['file.scss'], diff --git a/src/version.c b/src/version.c index f552a271d7..620e7b26f5 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 */ +/**/ + 1134, /**/ 1133, /**/