summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.md8
-rw-r--r--plugin/sleuth.vim7
2 files changed, 13 insertions, 2 deletions
diff --git a/README.md b/README.md
index bf51320b..8c744c10 100644
--- a/README.md
+++ b/README.md
@@ -245,7 +245,7 @@ Please make sure you have `syntax on` in your `.vimrc` (or use something like [s
Individual language packs can be disabled by setting `g:polyglot_disabled` as follows:
-```viml
+```vim
let g:polyglot_disabled = ['css']
```
@@ -253,6 +253,12 @@ let g:polyglot_disabled = ['css']
Please note that disabling a language won't make in your vim startup any faster / slower (only for specific this specific filetype). All plugins are loaded lazily, on demand.
+Vim Polyglot tries to automatically detect indentation settings (just like vim-sleuth). If this feature is not working for you for some reason, please file an issue and disable it temporarily with:
+
+```vim
+let g:polyglot_disabled = ['autoindent']
+```
+
## Contributing
Language packs are periodically updated using automated `scripts/build` script.
diff --git a/plugin/sleuth.vim b/plugin/sleuth.vim
index 12086173..d7b9b773 100644
--- a/plugin/sleuth.vim
+++ b/plugin/sleuth.vim
@@ -7,10 +7,15 @@
" - check maximum of files 2 per directory level instead of 8
" - maximum of 3 directory levels are checked
" - globs are concatenated for performance
+" - tabstop setting is not configured, it's up to user
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'autoindent') != -1
+ finish
+endif
-if exists("g:loaded_sleuth") || v:version < 700 || &cp
+if exists("g:loaded_sleuth") || exists("g:polyglot_disabled") || v:version < 700 || &cp
finish
endif
+
let g:loaded_sleuth = 1
function! s:guess(lines) abort