sensible.vim 1.2

* Enable upwards tags file searching with `./tags;` in 'tags'.
* Enable joining commented lines with `formatoptions` j flag.
* Remove 'showcmd', 'shiftround', and 'fileformat' changes.
* Allow fish as 'shell' for compatible Vim versions.
* Don't override user specified 'ttimeoutlen'.
* Don't force `t_Co` to 16 for Eterm.
* Add :diffupdate to CTRL-L map.

README.markdown

@@ -31,10 +31,7 @@ mostly `:set` calls.)  Here's a taste:
 * `'incsearch'`: Start searching before pressing enter.
 * `'listchars'`: Makes `:set list` (visible whitespace) prettier.
 * `'scrolloff'`: Always show at least one line above/below the cursor.
-* `'directory'`: Dump swap files under `~/.cache/vim/swap` (only if that
-  directory already exists).  Also `'backupdir'` and `'undodir'`.  Try
-  `mkdir -p ~/.cache/vim/{swap,backup,undo}`.
-* `nmap Y y$`: Make `Y` behave like `C` and `D`.
+* `'autoread'`: Autoload file changes. You can undo by pressing `u`.
 * `runtime! macros/matchit.vim`: Load the version of matchit.vim that ships
   with Vim.
 
@@ -73,10 +70,10 @@ persuasion for me to remove them.  Everything else is negotiable.
 Feel free to ask a question if you're not sure why I've set something, as I
 haven't put much effort into documenting that.
 
-I'm a stickler for [commit messages][], so if you send me a pull
-request with so much as superfluous period in the subject line, I will
-close it without so much as a second thought, and save my precious attention
-for someone who can actually follow directions.
+I'm a stickler for [commit messages][], so if you send me a pull request with
+so much as a superfluous period in the subject line, I will close it without
+so much as a second thought, and save my precious attention for someone who
+can actually follow directions.
 
 [GitHub issues]: http://github.com/tpope/vim-sensible/issues
 [commit messages]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html

plugin/sensible.vim

@@ -1,11 +1,11 @@
 " sensible.vim - Defaults everyone can agree on
 " Maintainer:   Tim Pope <http://tpo.pe/>
-" Version:      1.0
+" Version:      1.2
 
 if exists('g:loaded_sensible') || &compatible
   finish
 else
-  let g:loaded_sensible = 1
+  let g:loaded_sensible = 'yes'
 endif
 
 if has('autocmd')
@@ -17,76 +17,79 @@ endif
 
 " Use :help 'option' to see the documentation for the given option.
 
+set autoindent
 set backspace=indent,eol,start
 set complete-=i
-set showmatch
-
-set autoindent
 set smarttab
 
-set ttimeout
-set ttimeoutlen=50
+set nrformats-=octal
+
+if !has('nvim') && &ttimeoutlen == -1
+  set ttimeout
+  set ttimeoutlen=100
+endif
 
 set incsearch
-set smartcase
 " Use <C-L> to clear the highlighting of :set hlsearch.
 if maparg('<C-L>', 'n') ==# ''
-  nnoremap <silent> <C-L> :nohlsearch<CR><C-L>
+  nnoremap <silent> <C-L> :nohlsearch<C-R>=has('diff')?'<Bar>diffupdate':''<CR><CR><C-L>
 endif
 
 set laststatus=2
 set ruler
-set showcmd
 set wildmenu
 
-set scrolloff=1
-set sidescrolloff=5
+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:+
-  if &termencoding ==# 'utf-8' || &encoding ==# 'utf-8'
-    let &listchars = "tab:\u21e5 ,trail:\u2423,extends:\u21c9,precedes:\u21c7,nbsp:\u26ad"
-    let &fillchars = "vert:\u259a,fold:\u00b7"
-  endif
+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 &shell =~# 'fish$' && (v:version < 704 || v:version == 704 && !has('patch276'))
+  set shell=/bin/bash
 endif
 
 set autoread
-set autowrite
-set fileformats=unix,dos,mac
 
-set viminfo^=!
-
-if isdirectory(expand('~/.cache/vim'))
-  if &directory =~# '^\.,'
-    set directory^=~/.cache/vim/swap//
-  endif
-  if &backupdir =~# '^\.,'
-    set backupdir^=~/.cache/vim/backup//
-  endif
-  if exists('+undodir') && &undodir =~# '^\.\%(,\|$\)'
-    set undodir^=~/.cache/vim/undo//
-  endif
+if &history < 1000
+  set history=1000
 endif
-if exists('+undofile')
-  set undofile
+if &tabpagemax < 50
+  set tabpagemax=50
 endif
+if !empty(&viminfo)
+  set viminfo^=!
+endif
+set sessionoptions-=options
 
-" Allow color schemes do bright colors without forcing bold.
-if &t_Co == 8 && $TERM !~# '^linux'
+" Allow color schemes to do bright colors without forcing bold.
+if &t_Co == 8 && $TERM !~# '^linux\|^Eterm'
   set t_Co=16
 endif
 
-if !exists('g:netrw_list_hide')
-  let g:netrw_list_hide = '^\.,\~$,^tags$'
-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
 
-" Make Y consistent with C and D.  See :help Y.
-nnoremap Y y$
+inoremap <C-U> <C-G>u<C-U>
 
 " vim:set ft=vim et sw=2: