diff --git a/runtime/filetype.vim b/runtime/filetype.vim index df37ff7f59..de00f23c52 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1,7 +1,7 @@ " Vim support file to detect file types " " Maintainer: Bram Moolenaar -" Last Change: 2017 Aug 09 +" Last Change: 2017 Aug 11 " Listen very carefully, I will say this only once if exists("did_load_filetypes") @@ -1342,6 +1342,9 @@ au BufNewFile,BufRead *.mush setf mush " Mutt setup file (also for Muttng) au BufNewFile,BufRead Mutt{ng,}rc setf muttrc +" N1QL +au BufRead,BufNewfile *.n1ql,*.nql setf n1ql + " Nano au BufNewFile,BufRead */etc/nanorc,*.nanorc setf nanorc diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index d6ecfb26a7..9cce23a5c8 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -297,6 +297,7 @@ let s:filename_checks = { \ 'mush': ['file.mush'], \ 'muttrc': ['Muttngrc', 'Muttrc'], \ 'mysql': ['file.mysql'], + \ 'n1ql': ['file.n1ql', 'file.nql'], \ 'named': ['namedfile.conf', 'rndcfile.conf'], \ 'nanorc': ['/etc/nanorc', 'file.nanorc'], \ 'ncf': ['file.ncf'], diff --git a/src/version.c b/src/version.c index 80730682c9..a941d85cba 100644 --- a/src/version.c +++ b/src/version.c @@ -769,6 +769,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 906, /**/ 905, /**/