summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-11-18 12:12:39 +0100
committerBram Moolenaar <Bram@vim.org>2020-11-18 12:12:39 +0100
commit88774a30c0b1957a6177cdb69d2becedae610299 (patch)
tree09d9a5ffb281bd0f8a8615e04c783b3fa345eb83
parentc77534c303721df4024fd6cfd51098d593b7d4da (diff)
patch 8.2.2006: .pbtxt files are not recognizedv8.2.2006
Problem: .pbtxt files are not recognized. Solution: Recognize .pbtxt as protobuf text buffers. (closes #7326)
-rw-r--r--runtime/filetype.vim1
-rw-r--r--src/testdir/test_filetype.vim1
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 0 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index a16a28d7af..9381402031 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1305,6 +1305,7 @@ au BufNewFile,BufRead *.pml setf promela
" Google protocol buffers
au BufNewFile,BufRead *.proto setf proto
+au BufNewFile,BufRead *.pbtxt setf pbtxt
" Protocols
au BufNewFile,BufRead */etc/protocols setf protocols
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 0e5a0cd04c..90e2ca080f 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -345,6 +345,7 @@ let s:filename_checks = {
\ 'papp': ['file.papp', 'file.pxml', 'file.pxsl'],
\ 'pascal': ['file.pas', 'file.pp', 'file.dpr', 'file.lpr'],
\ 'passwd': ['any/etc/passwd', 'any/etc/passwd-', 'any/etc/passwd.edit', 'any/etc/shadow', 'any/etc/shadow-', 'any/etc/shadow.edit', 'any/var/backups/passwd.bak', 'any/var/backups/shadow.bak', '/etc/passwd', '/etc/passwd-', '/etc/passwd.edit', '/etc/shadow', '/etc/shadow-', '/etc/shadow.edit', '/var/backups/passwd.bak', '/var/backups/shadow.bak'],
+ \ 'pbtxt': ['file.pbtxt'],
\ 'pccts': ['file.g'],
\ 'pdf': ['file.pdf'],
\ 'perl': ['file.plx', 'file.al', 'file.psgi', 'gitolite.rc', '.gitolite.rc', 'example.gitolite.rc'],
diff --git a/src/version.c b/src/version.c
index 2191c34060..4b91ba453c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2006,
+/**/
2005,
/**/
2004,