summaryrefslogtreecommitdiffstats
path: root/ftplugin
diff options
context:
space:
mode:
authorAdam Stankiewicz <sheerun@sher.pl>2014-01-09 11:59:09 +0100
committerAdam Stankiewicz <sheerun@sher.pl>2014-01-09 11:59:09 +0100
commitf211f02d1e53dbb4eada17e999eba81bccaf1fb2 (patch)
tree0c26fd0f916643af27e56fab71d3fe8dc58e4231 /ftplugin
parente45b23b6ee6e3b00ba4c7111f0c703f93fea9123 (diff)
downloadvim-polyglot-f211f02d1e53dbb4eada17e999eba81bccaf1fb2.tar.gz
vim-polyglot-f211f02d1e53dbb4eada17e999eba81bccaf1fb2.zip
Update
Diffstat (limited to 'ftplugin')
-rw-r--r--ftplugin/latex-box/complete.vim2
-rw-r--r--ftplugin/scala.vim5
2 files changed, 1 insertions, 6 deletions
diff --git a/ftplugin/latex-box/complete.vim b/ftplugin/latex-box/complete.vim
index 9f4f55d5..3b47a2f3 100644
--- a/ftplugin/latex-box/complete.vim
+++ b/ftplugin/latex-box/complete.vim
@@ -365,7 +365,7 @@ function! s:ExtractLabels()
let curname = strpart( getline( lblline ), lblbegin, nameend - lblbegin - 1 )
" Ignore cref entries (because they are duplicates)
- if curname =~ "\@cref"
+ if curname =~ "\@cref\|cref\@"
continue
endif
diff --git a/ftplugin/scala.vim b/ftplugin/scala.vim
index 00d45669..b042d4d3 100644
--- a/ftplugin/scala.vim
+++ b/ftplugin/scala.vim
@@ -1,8 +1,3 @@
-setlocal textwidth=140
-setlocal shiftwidth=2
-setlocal softtabstop=2
-setlocal expandtab
-setlocal formatoptions=tcqr
setlocal commentstring=//%s
let &l:include = '^\s*import'
let &l:includeexpr = 'substitute(v:fname,"\\.","/","g")'