summaryrefslogtreecommitdiff
path: root/runtime/syntax/rst.vim
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-10-15 22:51:52 +0200
committerBram Moolenaar <Bram@vim.org>2014-10-15 22:51:52 +0200
commit7d76c804af900ba6dcc4b1e45373ccab3418c6b2 (patch)
treebf107779c252569a3add17913ba11f42a30e3597 /runtime/syntax/rst.vim
parent1df52d798faf507fc0c340fdb19f98d435593f0e (diff)
downloadvim-git-7d76c804af900ba6dcc4b1e45373ccab3418c6b2.tar.gz
Update runtime files and translations.
Diffstat (limited to 'runtime/syntax/rst.vim')
-rw-r--r--runtime/syntax/rst.vim13
1 files changed, 10 insertions, 3 deletions
diff --git a/runtime/syntax/rst.vim b/runtime/syntax/rst.vim
index fce9e5dd3..c1f25699e 100644
--- a/runtime/syntax/rst.vim
+++ b/runtime/syntax/rst.vim
@@ -1,8 +1,8 @@
" Vim syntax file
-" Language: reStructuredText documentation format
-" Maintainer: Marshall Ward <marshall.ward@gmail.com>
+" Language: reStructuredText documentation format
+" Maintainer: Marshall Ward <marshall.ward@gmail.com>
" Previous Maintainer: Nikolai Weibull <now@bitwi.se>
-" Latest Revision: 2014-08-23
+" Latest Revision: 2014-10-03
if exists("b:current_syntax")
finish
@@ -150,12 +150,19 @@ endif
for code in g:rst_syntax_code_list
unlet! b:current_syntax
+ " guard against setting 'isk' option which might cause problems (issue #108)
+ let prior_isk = &l:iskeyword
exe 'syn include @rst'.code.' syntax/'.code.'.vim'
exe 'syn region rstDirective'.code.' matchgroup=rstDirective fold '
\.'start=#\%(sourcecode\|code\%(-block\)\=\)::\s\+'.code.'\_s*\n\ze\z(\s\+\)# '
\.'skip=#^$# '
\.'end=#^\z1\@!# contains=@NoSpell,@rst'.code
exe 'syn cluster rstDirectives add=rstDirective'.code
+ " reset 'isk' setting, if it has been changed
+ if &l:iskeyword !=# prior_isk
+ let &l:iskeyword = prior_isk
+ endif
+ unlet! prior_isk
endfor
" TODO: Use better syncing.