summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-08-11 20:50:04 +0200
committerBram Moolenaar <Bram@vim.org>2017-08-11 20:50:04 +0200
commitd9bc8a801aeaffa77d4094d43bf97f0ced3db92b (patch)
tree2e9723578bfa0ab136b7c7a4c1911e9fe3e5e664 /src
parent444fda208469916764d89403e77380a0cdaf6242 (diff)
downloadvim-git-d9bc8a801aeaffa77d4094d43bf97f0ced3db92b.tar.gz
patch 8.0.0906: don't recognize Couchbase filesv8.0.0906
Problem: Don't recognize Couchbase files. Solution: Add filetype detection. (Eugene Ciurana, closes #1951)
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test_filetype.vim1
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index d6ecfb26a..9cce23a5c 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 80730682c..a941d85cb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 906,
+/**/
905,
/**/
904,