From 7b16c1fa8451880c72769f6d3c311f24c74f4fc7 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Tue, 28 May 2024 06:39:07 +0800 Subject: fix(runtime): source c ftplugin properly for cpp on Windows (#29053) On Windows, '{' is currently not treated as a wildcard char, so another wildcard char is needed for the pattern to be treated as a wildcard. It may be worth trying to make '{' always a wildcard char in the future, but that'll be a bit harder as it'll be necessary to make sure '{' is escaped at various places. --- runtime/ftplugin/cpp.vim | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'runtime/ftplugin/cpp.vim') diff --git a/runtime/ftplugin/cpp.vim b/runtime/ftplugin/cpp.vim index d4931a2533..5cdad8fdc8 100644 --- a/runtime/ftplugin/cpp.vim +++ b/runtime/ftplugin/cpp.vim @@ -10,7 +10,8 @@ if exists("b:did_ftplugin") endif " Behaves mostly just like C -runtime! ftplugin/c.{vim,lua} ftplugin/c_*.{vim,lua} ftplugin/c/*.{vim,lua} +" XXX: "[.]" in the first pattern makes it a wildcard on Windows +runtime! ftplugin/c[.]{vim,lua} ftplugin/c_*.{vim,lua} ftplugin/c/*.{vim,lua} " C++ uses templates with " Disabled, because it gives an error for typing an unmatched ">". -- cgit From d490a7bc5b9d731828f5da16b35a86b4e1270624 Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Thu, 6 Jun 2024 18:46:11 +0200 Subject: vim-patch:ce47d32: runtime(cpp): Change 'cms' for C++ to '// %s' fixes: vim/vim#14911 closes: vim/vim#14926 https://github.com/vim/vim/commit/ce47d32b03bb7df0100b2625ef68fad1eb4646e3 Co-authored-by: Luc Hermitte --- runtime/ftplugin/cpp.vim | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'runtime/ftplugin/cpp.vim') diff --git a/runtime/ftplugin/cpp.vim b/runtime/ftplugin/cpp.vim index 5cdad8fdc8..73768bc592 100644 --- a/runtime/ftplugin/cpp.vim +++ b/runtime/ftplugin/cpp.vim @@ -1,7 +1,7 @@ " Vim filetype plugin file " Language: C++ " Maintainer: The Vim Project -" Last Change: 2023 Aug 10 +" Last Change: 2024 Jun 06 " Former Maintainer: Bram Moolenaar " Only do this when not done yet for this buffer @@ -13,6 +13,10 @@ endif " XXX: "[.]" in the first pattern makes it a wildcard on Windows runtime! ftplugin/c[.]{vim,lua} ftplugin/c_*.{vim,lua} ftplugin/c/*.{vim,lua} +" Change 'commentstring' to "C++ style"/"mono-line" comments +setlocal commentstring=//\ %s +let b:undo_ftplugin ..= ' | setl commentstring<' + " C++ uses templates with " Disabled, because it gives an error for typing an unmatched ">". " set matchpairs+=<:> -- cgit