vim: Update sensible.vim

packages/vim/vimrc

@@ -10,13 +10,22 @@ set mouse=a
 
 " sensible.vim - Defaults everyone can agree on
 " Maintainer:   Tim Pope <http://tpo.pe/>
-" Version:      1.1
+" Version:      1.2
 
-set nocompatible
-let g:loaded_sensible = 1
+if exists('g:loaded_sensible') || &compatible
+  finish
+else
+  let g:loaded_sensible = 'yes'
+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.
 
 set autoindent
 set backspace=indent,eol,start
@@ -25,8 +34,10 @@ set smarttab
 
 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.
@@ -46,7 +57,9 @@ if !&sidescrolloff
 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:+
@@ -60,6 +73,10 @@ 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=/usr/bin/env\ bash
+endif
+
 set autoread
 
 if &history < 1000
@@ -84,3 +101,5 @@ if !exists('g:loaded_matchit') && findfile('plugin/matchit.vim', &rtp) ==# ''
 endif
 
 inoremap <C-U> <C-G>u<C-U>
+
+" vim:set ft=vim et sw=2: