Merge branch 'option-no-mapping' of git://github.com/suy/vim-indent-guides into suy-option-no-mapping

* 'option-no-mapping' of git://github.com/suy/vim-indent-guides:
  Add option g:indent_guides_default_mapping

Conflicts:
	plugin/indent_guides.vim
This commit is contained in:
Nate Kane 2013-06-27 19:43:10 +10:00
commit 3cfeff1930
2 changed files with 10 additions and 1 deletions

View File

@ -179,6 +179,14 @@ map it to other keys. For example:
:nmap <silent> <Leader>ig <Plug>IndentGuidesToggle
<
The plugin will not provide the default mapping if either:
* You already have something mapped to <Plug>IndentGuidesToggle.
* You are already using the <Leader>ig key sequence.
* You set to 0 the variable g:indent_guides_default_mapping:
>
let g:indent_guides_default_mapping=0
<
You can also map some other commands that are not mapped by default. For
example:
>

View File

@ -54,7 +54,7 @@ call s:InitVariable('g:indent_guides_enable_on_vim_startup', 0)
call s:InitVariable('g:indent_guides_debug', 0)
call s:InitVariable('g:indent_guides_space_guides', 1)
call s:InitVariable('g:indent_guides_soft_pattern', '\s')
call s:InitVariable('g:indent_guides_default_mapping', 1)
if !exists('g:indent_guides_exclude_filetypes')
let g:indent_guides_exclude_filetypes = ['help']
@ -62,6 +62,7 @@ endif
" Default mapping
if !hasmapto('<Plug>IndentGuidesToggle', 'n') && maparg('<Leader>ig', 'n') == ''
\ && g:indent_guides_default_mapping != 0
nmap <silent><unique> <Leader>ig <Plug>IndentGuidesToggle
endif