Merge vim sensible from tpope with previous settings

vim/.config/vim/plugin/settings.vim

@@ -1,31 +1,104 @@
-syntax on
+if has('syntax') && !exists('g:syntax_on')
+    syntax enable
+endif
+
+if has('autocmd')
     filetype plugin on
     filetype indent on
+endif
 
-"colorscheme PaperColor
-"colorscheme solarized
-colorscheme wombat
+set autoindent
+set backspace=indent,eol,start
+set complete-=i
+set smarttab
 
-" Basics
+set nrformats-=octal
+
+if !has('nvim') && &ttimeoutlen == -1
+    set ttimeout
+    set ttimeoutlen=100
+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
+
+" Status
+" ~/file [type] [line,column] [number of lines]
+set statusline=%F%m%r%h%w\ [%Y]\ [%03l,%03v]\ [%L]
+
+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 &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 has('path_extra')
+    setglobal tags-=./tags tags-=./tags; tags^=./tags;
+endif
+
+set autoread
+
+if &history < 10000
+    set history=10000
+endif
+if &tabpagemax < 50
+    set tabpagemax=50
+endif
+if !empty(&viminfo)
+    set viminfo^=!
+endif
+set sessionoptions-=options
+set viewoptions-=options
+
+
+" Allow color schemes to do bright colors without forcing bold.
+if &t_Co == 8 && $TERM !~# '^Eterm'
+    set t_Co=16
+else
     set t_Co=256
-set encoding=utf8
-set nocompatible
-set background=dark
-" set background=light
+endif
+
+if empty(mapcheck('<C-U>', 'i'))
+    inoremap <C-U> <C-G>u<C-U>
+endif
+
+if empty(mapcheck('<C-W>', 'i'))
+    inoremap <C-W> <C-G>u<C-W>
+endif
+
+" Basics
+set encoding=utf-8
 
 " General
 " setlocal spell spelllang=en_us
 set fileformats=unix,dos,mac
 set nostartofline
-set history=10000
-set autoread
 set autochdir
 set colorcolumn=81
 
 " Have tab complete work more like bash
-set wildmenu
 set wildmode=list:longest
-set backspace=start,eol,indent
 set whichwrap+=<,>,[,]
 set magic
 
@@ -41,27 +114,19 @@ set softtabstop=4
 set tabstop=4
 
 " Indent
-set autoindent
 set smartindent
 set copyindent
 set preserveindent
 set shiftround
 
-" Status
-" ~/file [type] [line,column] [number of lines]
-set statusline=%F%m%r%h%w\ [%Y]\ [%03l,%03v]\ [%L]
-set laststatus=2
-
 " Text Formatting/Layout
 set nowrap
 set ignorecase
 set smartcase
 set list
-set listchars=tab:\ \ ,trail:…
 
 " UI
 set showcmd
-set ruler
 set number relativenumber
 set numberwidth=4
 set hidden
@@ -70,10 +135,7 @@ set hidden
 set showmatch
 set matchtime=2
 set hlsearch
-set incsearch
-set scrolloff=5
-set sidescrolloff=5
 set noerrorbells
 set novisualbell
 set t_vb=
-set tm=500
+set timeoutlen=500

vim/.config/vim/plugin/theme.vim

@@ -0,0 +1,2 @@
+colorscheme wombat
+set background=dark

vim/.config/vim/vimrc

@@ -1,3 +1,7 @@
+" Setting nocompatible here because this setting can effect other settings.
+" The vim help suggests this as the first setting because of the side effects.
+set nocompatible
+
 " Load from init.d instead of plugin directory. This is done so a leader key
 " can be set before loading plugin settings. This allows the plugin setting
 " files to set mappings with leader keys