patch 9.1.0306: filetype: x11vnc config file is not recognized

Problem:  filetype: x11vnc config file is not recognized
Solution: Detect '.x11vncrc' as conf filetype
          (Wu, Zhenyu)

See: https://linux.die.net/man/1/x11vnc

closes: #14511

Signed-off-by: Wu, Zhenyu <wuzhenyu@ustc.edu>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 9c2f4aa892e55b5e170ff56a7292e7fbbbd398da..a45d0620e79a255308e5a643fdf5383e2e0bd58f 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -2615,6 +2615,9 @@ au BufNewFile,BufRead *.ws[fc]                    setf wsh
 " XHTML
 au BufNewFile,BufRead *.xhtml,*.xht            setf xhtml
 
+" X11vnc
+au BufNewFile,BufRead .x11vncrc                        setf conf
+
 " X Pixmap (dynamically sets colors, this used to trigger on BufEnter to make
 " it work better, but that breaks setting 'filetype' manually)
 au BufNewFile,BufRead *.xpm

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index b840ef112ff240134adf73ba8e27808176526a8f..e04eb35618ffad36fc0f46a796031b1bbf23155f 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -162,7 +162,7 @@ def s:GetFilenameChecks(): dict<list<string>>
     cobol: ['file.cbl', 'file.cob', 'file.lib'],
     coco: ['file.atg'],
     conaryrecipe: ['file.recipe'],
-    conf: ['auto.master', 'file.conf'],
+    conf: ['auto.master', 'file.conf', '.x11vncrc'],
     config: ['configure.in', 'configure.ac', '/etc/hostname.file', 'any/etc/hostname.file'],
     confini: ['/etc/pacman.conf', 'any/etc/pacman.conf', 'mpv.conf', 'any/.aws/config', 'any/.aws/credentials', 'file.nmconnection'],
     context: ['tex/context/any/file.tex', 'file.mkii', 'file.mkiv', 'file.mkvi', 'file.mkxl', 'file.mklx'],

diff --git a/src/version.c b/src/version.c
index 7310309df7e3b99c52216eca4aa37d593d7427bf..a7a96644e288402e7fe15f897f9c67422d7f387f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    306,
 /**/
     305,
 /**/