Allow to override incsearch, #603

2 files changed, 18 insertions, 13 deletions

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index e345dc6d..49b2c894 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -3491,6 +3491,21 @@ if exists("did_load_filetypes") && exists("g:polyglot_disabled")
   runtime! extras/filetype.vim
 endif
 
+
+if !has_key(s:disabled_packages, 'sensible')
+  " Reload unchanged files automatically.
+  set autoread
+
+  " Enable highlighted case-insensitive incremential search.
+  set incsearch
+
+  " Use utf-8 encoding by default
+  set encoding=utf-8
+
+  " Autoindent when starting new line, or using `o` or `O`.
+  set autoindent
+endif
+
 " Restore 'cpoptions'
 let &cpo = s:cpo_save
 unlet s:cpo_save
diff --git a/plugin/polyglot.vim b/plugin/polyglot.vim
index d4a60b29..c5074088 100644
--- a/plugin/polyglot.vim
+++ b/plugin/polyglot.vim
@@ -18,11 +18,10 @@ endif
 "
 " Only settings that matter for proper editing are left
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sensible') == -1
-  " Autoindent when starting new line, or using `o` or `O`.
-  set autoindent
-
   " Allow backspace in insert mode.
-  set backspace=indent,eol,start
+  if &backspace == ""
+    set backspace=indent,eol,start
+  endif
 
   " Allow for mappings including `Esc`, while preserving
   " zero timeout after pressing it manually.
@@ -32,12 +31,6 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sensible') == -
     set ttimeoutlen=100
   endif
 
-  " Enable highlighted case-insensitive incremential search.
-  set incsearch
-
-  " Use utf-8 encoding by default
-  set encoding=utf-8
-
   " Set default whitespace characters when using `:set list`
   if &listchars ==# 'eol:$'
     set listchars=tab:>\ ,trail:-,extends:>,precedes:<,nbsp:+
@@ -59,9 +52,6 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sensible') == -
     set shell=/usr/bin/env\ bash
   endif
 
-  " Reload unchanged files automatically.
-  set autoread
-
   " Increase history size to 1000 items.
   if &history < 1000
     set history=1000