changeset 34882:a3b37b1cae3a v9.1.0306

patch 9.1.0306: filetype: x11vnc config file is not recognized Commit: https://github.com/vim/vim/commit/58ce78ad438deefec54fd6206166ca2794cd6efe Author: Wu, Zhenyu <wuzhenyu@ustc.edu> Date: Thu Apr 11 20:47:45 2024 +0200 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>
author Christian Brabandt <cb@256bit.org>
date Thu, 11 Apr 2024 21:00:03 +0200
parents 6a85ec31813a
children bac50a892d76
files runtime/filetype.vim src/testdir/test_filetype.vim src/version.c
diffstat 3 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -2615,6 +2615,9 @@ au BufNewFile,BufRead *.ws[fc]			setf ws
 " 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
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -162,7 +162,7 @@ def s:GetFilenameChecks(): dict<list<str
     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'],
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    306,
+/**/
     305,
 /**/
     304,