From 58ce78ad438deefec54fd6206166ca2794cd6efe Mon Sep 17 00:00:00 2001 From: "Wu, Zhenyu" Date: Thu, 11 Apr 2024 20:47:45 +0200 Subject: 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 Signed-off-by: Christian Brabandt --- runtime/filetype.vim | 3 +++ src/testdir/test_filetype.vim | 2 +- src/version.c | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 9c2f4aa892..a45d0620e7 100644 --- 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 b840ef112f..e04eb35618 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -162,7 +162,7 @@ def s:GetFilenameChecks(): dict> 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 7310309df7..a7a96644e2 100644 --- 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, /**/ -- cgit v1.2.3