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 247f9acf3b..88956422a0 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -205,6 +205,9 @@ au BufNewFile,BufRead *.mch,*.ref,*.imp setf b
au BufNewFile,BufRead *.bas call dist#ft#FTbas()
au BufNewFile,BufRead *.bi,*.bm call dist#ft#FTbas()
+" Bass
+au BufNewFile,BufRead *.bass setf bass
+
" Visual Basic Script (close to Visual Basic) or Visual Basic .NET
au BufNewFile,BufRead *.vb,*.vbs,*.dsm,*.ctl setf vb
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index a482cb0079..ff438bb85d 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -78,6 +78,7 @@ let s:filename_checks = {
\ 'awk': ['file.awk', 'file.gawk'],
\ 'b': ['file.mch', 'file.ref', 'file.imp'],
\ 'basic': ['file.bas', 'file.bi', 'file.bm'],
+ \ 'bass': ['file.bass'],
\ 'bc': ['file.bc'],
\ 'bdf': ['file.bdf'],
\ 'beancount': ['file.beancount'],
diff --git a/src/version.c b/src/version.c
index a370b3b11e..48bebad403 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1368,
+/**/
1367,
/**/
1366,