summaryrefslogtreecommitdiffstats
path: root/ftplugin
diff options
context:
space:
mode:
authorAdam Stankiewicz <sheerun@sher.pl>2015-03-08 21:32:50 -0700
committerAdam Stankiewicz <sheerun@sher.pl>2015-03-08 21:32:50 -0700
commit23913e0598d23ec5948b71ea78c549b39cecf764 (patch)
treef21bd3dd20a7fe0e46bed7dd11329a204fe4cc3f /ftplugin
parent1c2123117537fb4bccf87fcf39abc05eaf950ec2 (diff)
downloadvim-polyglot-1.12.1.tar.gz
vim-polyglot-1.12.1.zip
Updatev1.12.1
Diffstat (limited to 'ftplugin')
-rw-r--r--ftplugin/latex-box/motion.vim4
-rw-r--r--ftplugin/perl6.vim2
-rw-r--r--ftplugin/ruby.vim2
3 files changed, 4 insertions, 4 deletions
diff --git a/ftplugin/latex-box/motion.vim b/ftplugin/latex-box/motion.vim
index 7e5b0011..66b9e4fc 100644
--- a/ftplugin/latex-box/motion.vim
+++ b/ftplugin/latex-box/motion.vim
@@ -349,7 +349,7 @@ function! s:ReadTOC(auxfile, texfile, ...)
if len(tree) > 3 && empty(tree[1])
call remove(tree, 1)
endif
- if len(tree) > 1 && type(tree[0]) == type("") && tree[0] =~ '^\\\(numberline\|tocsection\)'
+ if len(tree) > 1 && type(tree[0]) == type("") && tree[0] =~ '^\\\(\(chapter\)\?numberline\|tocsection\)'
let secnum = LatexBox_TreeToTex(tree[1])
let secnum = substitute(secnum, '\\\S\+\s', '', 'g')
let secnum = substitute(secnum, '\\\S\+{\(.\{-}\)}', '\1', 'g')
@@ -359,7 +359,7 @@ function! s:ReadTOC(auxfile, texfile, ...)
" parse section title
let text = LatexBox_TreeToTex(tree)
let text = substitute(text, '^{\+\|}\+$', '', 'g')
- let text = substitute(text, '\m^\\\(no\)\?numberline\s*', '', '')
+ let text = substitute(text, '\m^\\\(no\)\?\(chapter\)\?numberline\s*', '', '')
let text = substitute(text, '\*', '', 'g')
" add TOC entry
diff --git a/ftplugin/perl6.vim b/ftplugin/perl6.vim
index ebb39555..9a21122b 100644
--- a/ftplugin/perl6.vim
+++ b/ftplugin/perl6.vim
@@ -43,7 +43,7 @@ setlocal define=[^A-Za-z_]
" after/ftplugin/perl6.vim file that contains
" set isfname-=:
set isfname+=:
-setlocal iskeyword=48-57,_,A-Z,a-z,:,-
+setlocal iskeyword=@,48-57,_,192-255,:,-,'
" Set this once, globally.
if !exists("perlpath")
diff --git a/ftplugin/ruby.vim b/ftplugin/ruby.vim
index a032928c..c8c3946f 100644
--- a/ftplugin/ruby.vim
+++ b/ftplugin/ruby.vim
@@ -28,7 +28,7 @@ if exists("loaded_matchit") && !exists("b:match_words")
\ ':' .
\ '\<\%(else\|elsif\|ensure\|when\|rescue\|break\|redo\|next\|retry\)\>' .
\ ':' .
- \ '\<end\>' .
+ \ '\%(^\|[^.\:@$]\)\@<=\<end\:\@!\>' .
\ ',{:},\[:\],(:)'
let b:match_skip =