From e15f2b4b9623df739ca38f1115286b2a4d4956cd Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sat, 3 Feb 2018 12:07:59 +0100
Subject: [PATCH] vim-patch:8.0.0906: don't recognize Couchbase files

Problem:    Don't recognize Couchbase files.
Solution:   Add filetype detection. (Eugene Ciurana, closes vim/vim#1951)

https://github.com/vim/vim/commit/d9bc8a801aeaffa77d4094d43bf97f0ced3db92b
---
 runtime/filetype.vim               | 3 +++
 src/nvim/testdir/test_filetype.vim | 1 +
 2 files changed, 4 insertions(+)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index fb2fad1220..a2e1f23bf1 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1334,6 +1334,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/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim
index df521872d9..5b195532d4 100644
--- a/src/nvim/testdir/test_filetype.vim
+++ b/src/nvim/testdir/test_filetype.vim
@@ -296,6 +296,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'],