aboutsummaryrefslogtreecommitdiff
path: root/runtime/ftplugin/c.vim
diff options
context:
space:
mode:
authorChristian Clason <christian.clason@uni-due.de>2021-09-22 15:12:06 +0200
committerGitHub <noreply@github.com>2021-09-22 06:12:06 -0700
commitfb6f27e86f2ca2fbff88737251d9e26016a62081 (patch)
treef265d2030c1cbebe73d03cd95763af4e0be07eb3 /runtime/ftplugin/c.vim
parente8fb0728e220bb378a8689415c3915fe5912e987 (diff)
downloadrneovim-fb6f27e86f2ca2fbff88737251d9e26016a62081.tar.gz
rneovim-fb6f27e86f2ca2fbff88737251d9e26016a62081.tar.bz2
rneovim-fb6f27e86f2ca2fbff88737251d9e26016a62081.zip
vim-patch:34cc7d8c034f #15753
Update runtime files https://github.com/vim/vim/commit/34cc7d8c034f2bc5b57455577051db8d72e2b87c
Diffstat (limited to 'runtime/ftplugin/c.vim')
-rw-r--r--runtime/ftplugin/c.vim10
1 files changed, 7 insertions, 3 deletions
diff --git a/runtime/ftplugin/c.vim b/runtime/ftplugin/c.vim
index 00937c2383..d4564a4aec 100644
--- a/runtime/ftplugin/c.vim
+++ b/runtime/ftplugin/c.vim
@@ -1,7 +1,7 @@
" Vim filetype plugin file
" Language: C
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2020 Feb 01
+" Last Change: 2021 Sep 21
" Only do this when not done yet for this buffer
if exists("b:did_ftplugin")
@@ -35,8 +35,11 @@ setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,://
" When the matchit plugin is loaded, this makes the % command skip parens and
" braces in comments properly.
-let b:match_words = '^\s*#\s*if\(\|def\|ndef\)\>:^\s*#\s*elif\>:^\s*#\s*else\>:^\s*#\s*endif\>'
-let b:match_skip = 's:comment\|string\|character\|special'
+if !exists("b:match_words")
+ let b:match_words = '^\s*#\s*if\(\|def\|ndef\)\>:^\s*#\s*elif\>:^\s*#\s*else\>:^\s*#\s*endif\>'
+ let b:match_skip = 's:comment\|string\|character\|special'
+ let b:undo_ftplugin ..= " | unlet! b:match_skip b:match_words"
+endif
" Win32 can filter files in the browse dialog
if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
@@ -57,6 +60,7 @@ if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
\ "C++ Source Files (*.cpp *.c++)\t*.cpp;*.c++\n" .
\ "All Files (*.*)\t*.*\n"
endif
+ let b:undo_ftplugin ..= " | unlet! b:browsefilter"
endif
let b:man_default_sects = '3,2'