diff --git a/autoload/indent_guides.vim b/autoload/indent_guides.vim index cbba32c..7804b5f 100644 --- a/autoload/indent_guides.vim +++ b/autoload/indent_guides.vim @@ -33,7 +33,7 @@ endfunction function! indent_guides#enable() let g:indent_guides_autocmds_enabled = 1 - if indent_guides#exclude_filetype() + if &diff || indent_guides#exclude_filetype() call indent_guides#clear_matches() return end diff --git a/doc/indent_guides.txt b/doc/indent_guides.txt index cd4c2d8..db5ffe4 100644 --- a/doc/indent_guides.txt +++ b/doc/indent_guides.txt @@ -239,6 +239,7 @@ Bug reports, feedback, suggestions etc are welcomed. * Added way to override the default mapping (thanks xuhdev). * Added option g:|indent_guides_exclude_filetypes| to specify a list of filetypes to disable the plugin for. + * Disable the plugin when in a diff. 1.6~ * Added option g:|indent_guides_space_guides| to control whether spaces are