|
@@ -1,92 +1,91 @@
|
|
" Sensible.vim
|
|
" Sensible.vim
|
|
|
|
|
|
if exists('g:loaded_sensible') || &compatible
|
|
if exists('g:loaded_sensible') || &compatible
|
|
- finish
|
|
|
|
else
|
|
else
|
|
let g:loaded_sensible = 1
|
|
let g:loaded_sensible = 1
|
|
-endif
|
|
|
|
|
|
|
|
-if has('autocmd')
|
|
|
|
- filetype plugin indent on
|
|
|
|
-endif
|
|
|
|
-if has('syntax') && !exists('g:syntax_on')
|
|
|
|
- syntax enable
|
|
|
|
-endif
|
|
|
|
|
|
+ if has('autocmd')
|
|
|
|
+ filetype plugin indent on
|
|
|
|
+ endif
|
|
|
|
+ if has('syntax') && !exists('g:syntax_on')
|
|
|
|
+ syntax enable
|
|
|
|
+ endif
|
|
|
|
|
|
-" Use :help 'option' to see the documentation for the given option.
|
|
|
|
|
|
+ " Use :help 'option' to see the documentation for the given option.
|
|
|
|
|
|
-set autoindent
|
|
|
|
-set backspace=indent,eol,start
|
|
|
|
-set complete-=i
|
|
|
|
-set smarttab
|
|
|
|
|
|
+ set autoindent
|
|
|
|
+ set backspace=indent,eol,start
|
|
|
|
+ set complete-=i
|
|
|
|
+ set smarttab
|
|
|
|
|
|
-set nrformats-=octal
|
|
|
|
|
|
+ set nrformats-=octal
|
|
|
|
|
|
-set ttimeout
|
|
|
|
-set ttimeoutlen=100
|
|
|
|
|
|
+ set ttimeout
|
|
|
|
+ set ttimeoutlen=100
|
|
|
|
|
|
-set incsearch
|
|
|
|
-" Use <C-L> to clear the highlighting of :set hlsearch.
|
|
|
|
-if maparg('<C-L>', 'n') ==# ''
|
|
|
|
- nnoremap <silent> <C-L> :nohlsearch<C-R>=has('diff')?'<Bar>diffupdate':''<CR><CR><C-L>
|
|
|
|
-endif
|
|
|
|
|
|
+ set incsearch
|
|
|
|
+ " Use <C-L> to clear the highlighting of :set hlsearch.
|
|
|
|
+ if maparg('<C-L>', 'n') ==# ''
|
|
|
|
+ nnoremap <silent> <C-L> :nohlsearch<C-R>=has('diff')?'<Bar>diffupdate':''<CR><CR><C-L>
|
|
|
|
+ endif
|
|
|
|
|
|
-set laststatus=2
|
|
|
|
-set ruler
|
|
|
|
-set wildmenu
|
|
|
|
|
|
+ set laststatus=2
|
|
|
|
+ set ruler
|
|
|
|
+ set wildmenu
|
|
|
|
|
|
-if !&scrolloff
|
|
|
|
- set scrolloff=1
|
|
|
|
-endif
|
|
|
|
-if !&sidescrolloff
|
|
|
|
- set sidescrolloff=5
|
|
|
|
-endif
|
|
|
|
-set display+=lastline
|
|
|
|
|
|
+ if !&scrolloff
|
|
|
|
+ set scrolloff=1
|
|
|
|
+ endif
|
|
|
|
+ if !&sidescrolloff
|
|
|
|
+ set sidescrolloff=5
|
|
|
|
+ endif
|
|
|
|
+ set display+=lastline
|
|
|
|
|
|
-if &encoding ==# 'latin1' && has('gui_running')
|
|
|
|
- set encoding=utf-8
|
|
|
|
-endif
|
|
|
|
|
|
+ if &encoding ==# 'latin1' && has('gui_running')
|
|
|
|
+ set encoding=utf-8
|
|
|
|
+ endif
|
|
|
|
|
|
-if &listchars ==# 'eol:$'
|
|
|
|
- set listchars=tab:>\ ,trail:-,extends:>,precedes:<,nbsp:+
|
|
|
|
-endif
|
|
|
|
|
|
+ if &listchars ==# 'eol:$'
|
|
|
|
+ set listchars=tab:>\ ,trail:-,extends:>,precedes:<,nbsp:+
|
|
|
|
+ endif
|
|
|
|
|
|
-if v:version > 703 || v:version == 703 && has("patch541")
|
|
|
|
- set formatoptions+=j " Delete comment character when joining commented lines
|
|
|
|
-endif
|
|
|
|
|
|
+ if v:version > 703 || v:version == 703 && has("patch541")
|
|
|
|
+ set formatoptions+=j " Delete comment character when joining commented lines
|
|
|
|
+ endif
|
|
|
|
|
|
-if has('path_extra')
|
|
|
|
- setglobal tags-=./tags tags-=./tags; tags^=./tags;
|
|
|
|
-endif
|
|
|
|
|
|
+ if has('path_extra')
|
|
|
|
+ setglobal tags-=./tags tags-=./tags; tags^=./tags;
|
|
|
|
+ endif
|
|
|
|
|
|
-if &shell =~# 'fish$' && (v:version < 704 || v:version == 704 && !has('patch276'))
|
|
|
|
- set shell=/bin/bash
|
|
|
|
-endif
|
|
|
|
|
|
+ if &shell =~# 'fish$' && (v:version < 704 || v:version == 704 && !has('patch276'))
|
|
|
|
+ set shell=/bin/bash
|
|
|
|
+ endif
|
|
|
|
|
|
-set autoread
|
|
|
|
|
|
+ set autoread
|
|
|
|
|
|
-if &history < 1000
|
|
|
|
- set history=1000
|
|
|
|
-endif
|
|
|
|
-if &tabpagemax < 50
|
|
|
|
- set tabpagemax=50
|
|
|
|
-endif
|
|
|
|
-if !empty(&viminfo)
|
|
|
|
- set viminfo^=!
|
|
|
|
-endif
|
|
|
|
-set sessionoptions-=options
|
|
|
|
|
|
+ if &history < 1000
|
|
|
|
+ set history=1000
|
|
|
|
+ endif
|
|
|
|
+ if &tabpagemax < 50
|
|
|
|
+ set tabpagemax=50
|
|
|
|
+ endif
|
|
|
|
+ if !empty(&viminfo)
|
|
|
|
+ set viminfo^=!
|
|
|
|
+ endif
|
|
|
|
+ set sessionoptions-=options
|
|
|
|
|
|
-" Allow color schemes to do bright colors without forcing bold.
|
|
|
|
-if &t_Co == 8 && $TERM !~# '^linux\|^Eterm'
|
|
|
|
- set t_Co=16
|
|
|
|
-endif
|
|
|
|
|
|
+ " Allow color schemes to do bright colors without forcing bold.
|
|
|
|
+ if &t_Co == 8 && $TERM !~# '^linux\|^Eterm'
|
|
|
|
+ set t_Co=16
|
|
|
|
+ endif
|
|
|
|
|
|
-" Load matchit.vim, but only if the user hasn't installed a newer version.
|
|
|
|
-if !exists('g:loaded_matchit') && findfile('plugin/matchit.vim', &rtp) ==# ''
|
|
|
|
- runtime! macros/matchit.vim
|
|
|
|
-endif
|
|
|
|
|
|
+ " Load matchit.vim, but only if the user hasn't installed a newer version.
|
|
|
|
+ if !exists('g:loaded_matchit') && findfile('plugin/matchit.vim', &rtp) ==# ''
|
|
|
|
+ runtime! macros/matchit.vim
|
|
|
|
+ endif
|
|
|
|
|
|
-inoremap <C-U> <C-G>u<C-U>
|
|
|
|
|
|
+ inoremap <C-U> <C-G>u<C-U>
|
|
|
|
+endif
|
|
|
|
|
|
" change terminal title
|
|
" change terminal title
|
|
set title
|
|
set title
|