From 6eaf10502c99e96704daa07987f73658d6c4d68a Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Fri, 10 Jun 2022 08:40:32 +0200 Subject: vim-patch:partial:63f32603789d (#18916) Update runtime files https://github.com/vim/vim/commit/63f32603789d1a27c559fc440325955fd0b8b500 skip translations skip user manual rewrite --- runtime/ftplugin/cs.vim | 44 +++++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 15 deletions(-) (limited to 'runtime/ftplugin') diff --git a/runtime/ftplugin/cs.vim b/runtime/ftplugin/cs.vim index 7c2cbda32f..f53ffcbc8e 100644 --- a/runtime/ftplugin/cs.vim +++ b/runtime/ftplugin/cs.vim @@ -1,29 +1,43 @@ " Vim filetype plugin file -" Language: C# -" Maintainer: Johannes Zellner -" Last Change: Tue, 09 Mar 2004 14:09:33 CET +" Language: C# +" Maintainer: Nick Jensen +" Former Maintainer: Johannes Zellner +" Last Change: 2021-12-07 +" License: Vim (see :h license) +" Repository: https://github.com/nickspoons/vim-cs -" Only do this when not done yet for this buffer -if exists("b:did_ftplugin") +if exists('b:did_ftplugin') finish endif - -" Don't load another plugin for this buffer let b:did_ftplugin = 1 -let s:keepcpo= &cpo -set cpo&vim + +let s:save_cpo = &cpoptions +set cpoptions&vim " Set 'formatoptions' to break comment lines but not other lines, " and insert the comment leader when hitting or using "o". -setlocal fo-=t fo+=croql +setlocal formatoptions-=t formatoptions+=croql " Set 'comments' to format dashed lists in comments. setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,:///,:// -if has("gui_win32") && !exists("b:browsefilter") - let b:browsefilter = "C# Source Files (*.cs)\t*.cs\n" . - \ "All Files (*.*)\t*.*\n" +let b:undo_ftplugin = 'setl com< fo<' + +if exists('loaded_matchit') && !exists('b:match_words') + " #if/#endif support included by default + let b:match_words = '\%(^\s*\)\@<=#\s*region\>:\%(^\s*\)\@<=#\s*endregion\>,' + let b:undo_ftplugin .= ' | unlet! b:match_words' endif -let &cpo = s:keepcpo -unlet s:keepcpo +if (has('gui_win32') || has('gui_gtk')) && !exists('b:browsefilter') + let b:browsefilter = "C# Source Files (*.cs *.csx)\t*.cs;*.csx\n" . + \ "C# Project Files (*.csproj)\t*.csproj\n" . + \ "Visual Studio Solution Files (*.sln)\t*.sln\n" . + \ "All Files (*.*)\t*.*\n" + let b:undo_ftplugin .= ' | unlet! b:browsefilter' +endif + +let &cpoptions = s:save_cpo +unlet s:save_cpo + +" vim:et:sw=2:sts=2 -- cgit