Skip to content

Commit f52f6b9

Browse files
committed
Allow to override incsearch, #603
1 parent b6654c8 commit f52f6b9

File tree

2 files changed

+18
-13
lines changed

2 files changed

+18
-13
lines changed

ftdetect/polyglot.vim

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3491,6 +3491,21 @@ if exists("did_load_filetypes") && exists("g:polyglot_disabled")
34913491
runtime! extras/filetype.vim
34923492
endif
34933493

3494+
3495+
if !has_key(s:disabled_packages, 'sensible')
3496+
" Reload unchanged files automatically.
3497+
set autoread
3498+
3499+
" Enable highlighted case-insensitive incremential search.
3500+
set incsearch
3501+
3502+
" Use utf-8 encoding by default
3503+
set encoding=utf-8
3504+
3505+
" Autoindent when starting new line, or using `o` or `O`.
3506+
set autoindent
3507+
endif
3508+
34943509
" Restore 'cpoptions'
34953510
let &cpo = s:cpo_save
34963511
unlet s:cpo_save

plugin/polyglot.vim

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@ endif
1818
"
1919
" Only settings that matter for proper editing are left
2020
if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sensible') == -1
21-
" Autoindent when starting new line, or using `o` or `O`.
22-
set autoindent
23-
2421
" Allow backspace in insert mode.
25-
set backspace=indent,eol,start
22+
if &backspace == ""
23+
set backspace=indent,eol,start
24+
endif
2625

2726
" Allow for mappings including `Esc`, while preserving
2827
" zero timeout after pressing it manually.
@@ -32,12 +31,6 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sensible') == -
3231
set ttimeoutlen=100
3332
endif
3433

35-
" Enable highlighted case-insensitive incremential search.
36-
set incsearch
37-
38-
" Use utf-8 encoding by default
39-
set encoding=utf-8
40-
4134
" Set default whitespace characters when using `:set list`
4235
if &listchars ==# 'eol:$'
4336
set listchars=tab:>\ ,trail:-,extends:>,precedes:<,nbsp:+
@@ -59,9 +52,6 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sensible') == -
5952
set shell=/usr/bin/env\ bash
6053
endif
6154

62-
" Reload unchanged files automatically.
63-
set autoread
64-
6555
" Increase history size to 1000 items.
6656
if &history < 1000
6757
set history=1000

0 commit comments

Comments
 (0)