aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2024-04-12 17:20:35 +0800
committerzeertzjq <zeertzjq@outlook.com>2024-04-12 17:21:28 +0800
commitbe7d8ff0e44a5364adee1c6313cdd375267a26f3 (patch)
treecda10b9af050675cb94bd613b003079f8fb6fecd
parent7334e9055b279023014d0955f2f80a9a3f8a723b (diff)
downloadrneovim-be7d8ff0e44a5364adee1c6313cdd375267a26f3.tar.gz
rneovim-be7d8ff0e44a5364adee1c6313cdd375267a26f3.tar.bz2
rneovim-be7d8ff0e44a5364adee1c6313cdd375267a26f3.zip
vim-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: vim/vim#14511 https://github.com/vim/vim/commit/58ce78ad438deefec54fd6206166ca2794cd6efe Co-authored-by: Wu, Zhenyu <wuzhenyu@ustc.edu>
-rw-r--r--runtime/lua/vim/filetype.lua1
-rw-r--r--test/old/testdir/test_filetype.vim2
2 files changed, 2 insertions, 1 deletions
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 873e797e33..d8b818866c 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1302,6 +1302,7 @@ local filename = {
['csh.login'] = detect.csh,
['csh.logout'] = detect.csh,
['auto.master'] = 'conf',
+ ['.x11vncrc'] = 'conf',
['configure.in'] = 'config',
['configure.ac'] = 'config',
crontab = 'crontab',
diff --git a/test/old/testdir/test_filetype.vim b/test/old/testdir/test_filetype.vim
index 7aeea715a2..2471eb0d21 100644
--- a/test/old/testdir/test_filetype.vim
+++ b/test/old/testdir/test_filetype.vim
@@ -163,7 +163,7 @@ func s:GetFilenameChecks() abort
\ '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'],