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 9b7e698c21..4b58381234 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1181,6 +1181,9 @@ endif
" SBCL implementation of Common Lisp
au BufNewFile,BufRead sbclrc,.sbclrc setf lisp
+" Liquidsoap
+au BufNewFile,BufRead *.liq setf liquidsoap
+
" Liquid
au BufNewFile,BufRead *.liquid setf liquid
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 9e13777b7b..79065a036f 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -372,6 +372,7 @@ def s:GetFilenameChecks(): dict<list<string>>
lilo: ['lilo.conf', 'lilo.conf-file'],
lilypond: ['file.ly', 'file.ily'],
limits: ['/etc/limits', '/etc/anylimits.conf', '/etc/anylimits.d/file.conf', '/etc/limits.conf', '/etc/limits.d/file.conf', '/etc/some-limits.conf', '/etc/some-limits.d/file.conf', 'any/etc/limits', 'any/etc/limits.conf', 'any/etc/limits.d/file.conf', 'any/etc/some-limits.conf', 'any/etc/some-limits.d/file.conf'],
+ liquidsoap: ['file.liq'],
liquid: ['file.liquid'],
lisp: ['file.lsp', 'file.lisp', 'file.asd', 'file.el', 'file.cl', '.emacs', '.sawfishrc', 'sbclrc', '.sbclrc'],
lite: ['file.lite', 'file.lt'],
diff --git a/src/version.c b/src/version.c
index f517b5b7e5..655b1d1dda 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1907,
+/**/
1906,
/**/
1905,