summaryrefslogtreecommitdiffstats
path: root/runtime/ftplugin
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2011-09-14 17:55:08 +0200
committerBram Moolenaar <Bram@vim.org>2011-09-14 17:55:08 +0200
commit5302d9ebc1be723a25ff3dc62388305f6862749d (patch)
treedcd450a19d82d9eda33ba5fb9e1becd85f87a469 /runtime/ftplugin
parentddab33232a81e713c2748fc3daab763f07dd76f1 (diff)
Updated runtime files.
Diffstat (limited to 'runtime/ftplugin')
-rw-r--r--runtime/ftplugin/c.vim4
-rw-r--r--runtime/ftplugin/man.vim6
2 files changed, 6 insertions, 4 deletions
diff --git a/runtime/ftplugin/c.vim b/runtime/ftplugin/c.vim
index 162205bcee..7d6c298595 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: 2007 Sep 25
+" Last Change: 2011 Aug 04
" Only do this when not done yet for this buffer
if exists("b:did_ftplugin")
@@ -36,7 +36,7 @@ endif
" When the matchit plugin is loaded, this makes the % command skip parens and
" braces in comments.
-let b:match_words = &matchpairs
+let b:match_words = &matchpairs . ',^\s*#\s*if\(\|def\|ndef\)\>:^\s*#\s*elif\>:^\s*#\s*else\>:^\s*#\s*endif\>'
let b:match_skip = 's:comment\|string\|character'
" Win32 can filter files in the browse dialog
diff --git a/runtime/ftplugin/man.vim b/runtime/ftplugin/man.vim
index 3fb22a10d9..242a7712c7 100644
--- a/runtime/ftplugin/man.vim
+++ b/runtime/ftplugin/man.vim
@@ -1,7 +1,7 @@
" Vim filetype plugin file
" Language: man
" Maintainer: SungHyun Nam <goweol@gmail.com>
-" Last Change: 2010 Nov 29
+" Last Change: 2011 Jul 25
" To make the ":Man" command available before editing a manual page, source
" this script from your startup vimrc file.
@@ -17,7 +17,9 @@ if &filetype == "man"
" Ensure Vim is not recursively invoked (man-db does this)
" when doing ctrl-[ on a man page reference.
- let $MANPAGER = ""
+ if exists("$MANPAGER")
+ let $MANPAGER = ""
+ endif
" allow dot and dash in manual page name.
setlocal iskeyword+=\.,-