summaryrefslogtreecommitdiffstats
path: root/ftplugin
diff options
context:
space:
mode:
authorAdam Stankiewicz <sheerun@sher.pl>2016-06-17 20:47:16 +0200
committerAdam Stankiewicz <sheerun@sher.pl>2016-06-17 20:47:16 +0200
commit40c54bc12b5700f6bffed12209489e1f669f6423 (patch)
tree74b8abded0ba8ce296f3c358fefc16ec04e327a4 /ftplugin
parent44b3d860cb85ccb4edd52fb0dcf6a4102d12e82a (diff)
downloadvim-polyglot-2.9.2.tar.gz
vim-polyglot-2.9.2.zip
Updatev2.9.2
Diffstat (limited to 'ftplugin')
-rw-r--r--ftplugin/ruby.vim4
-rw-r--r--ftplugin/slim.vim1
2 files changed, 3 insertions, 2 deletions
diff --git a/ftplugin/ruby.vim b/ftplugin/ruby.vim
index 9a2283ef..786bb7c8 100644
--- a/ftplugin/ruby.vim
+++ b/ftplugin/ruby.vim
@@ -186,7 +186,7 @@ if !exists("g:no_plugin_maps") && !exists("g:no_ruby_maps")
\."| sil! exe 'unmap <buffer> [[' | sil! exe 'unmap <buffer> ]]' | sil! exe 'unmap <buffer> []' | sil! exe 'unmap <buffer> ]['"
\."| sil! exe 'unmap <buffer> [m' | sil! exe 'unmap <buffer> ]m' | sil! exe 'unmap <buffer> [M' | sil! exe 'unmap <buffer> ]M'"
- if maparg('im','n') == ''
+ if maparg('im','x') == '' && maparg('im','o') == '' && maparg('am','x') == '' && maparg('am','o') == ''
onoremap <silent> <buffer> im :<C-U>call <SID>wrap_i('[m',']M')<CR>
onoremap <silent> <buffer> am :<C-U>call <SID>wrap_a('[m',']M')<CR>
xnoremap <silent> <buffer> im :<C-U>call <SID>wrap_i('[m',']M')<CR>
@@ -196,7 +196,7 @@ if !exists("g:no_plugin_maps") && !exists("g:no_ruby_maps")
\."| sil! exe 'xunmap <buffer> im' | sil! exe 'xunmap <buffer> am'"
endif
- if maparg('iM','n') == ''
+ if maparg('iM','x') == '' && maparg('iM','o') == '' && maparg('aM','x') == '' && maparg('aM','o') == ''
onoremap <silent> <buffer> iM :<C-U>call <SID>wrap_i('[[','][')<CR>
onoremap <silent> <buffer> aM :<C-U>call <SID>wrap_a('[[','][')<CR>
xnoremap <silent> <buffer> iM :<C-U>call <SID>wrap_i('[[','][')<CR>
diff --git a/ftplugin/slim.vim b/ftplugin/slim.vim
index b3c71187..99ebeeb3 100644
--- a/ftplugin/slim.vim
+++ b/ftplugin/slim.vim
@@ -8,5 +8,6 @@ let b:did_ftplugin = 1
let b:undo_ftplugin = "setl isk<"
setlocal iskeyword+=-
+setlocal commentstring=/%s
endif