X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.vimrc;h=d28d4e5eec9da8d84e2a6a247a87bab5f2216a58;hp=b74b7c8221a53961bdb048e56eafec405c1d074c;hb=1424a2dd5f62dca2ec89dca4158c2675796dfa12;hpb=f8181fa72460c721a55995e0322eabd53f1cc3d4

diff --git a/.vimrc b/.vimrc
index b74b7c8..d28d4e5 100644
--- a/.vimrc
+++ b/.vimrc
@@ -134,6 +134,8 @@ if has("autocmd")
   endif
   augroup StatusLine
   autocmd!
+  augroup File
+  autocmd!
   augroup END
 endif
 
@@ -662,6 +664,40 @@ fun! Show_Paste() "{{{2
   endif
 endfun "}}}2
 
+" Helper for status line.
+" Show v when virtualedit mode is block, insert or onemore.
+" Show V when virtualedit mode is all.
+fun! Show_VirtualEdit() "{{{2
+  if ! has("virtualedit")
+    return ""
+  endif
+
+  if &ve == "all"
+    return "V"
+  elseif &ve
+    return "v"
+  else
+    return ""
+  endif
+endfun "}}}2
+
+" Helper for status line.
+" Show U when persistent undo is on.
+" Show u when persistent undo is off but an undofile exists.
+fun! Show_Undo() "{{{2
+  if ! exists("&undofile")
+    return ""
+  endif
+
+  if &undofile
+    return "U"
+  elseif filereadable(undofile(expand("%")))
+    return "u"
+  else
+    return ""
+  endif
+endfun "}}}2
+
 " Helper for status line.
 " Show alternate buffer number and name.
 fun! Show_Alt() "{{{2
@@ -679,7 +715,7 @@ fun! Show_StatusLine() "{{{2
     return
   endif
   call Iain_Vars()
-  let l:sl1='%2n\:\ %<%1*%f%0*\ [%{Show_List()}%{Show_Case()}%{Show_Tabstop()}%{Show_Paste()}%Y%M%R]%{Show_Alt()}\ '
+  let l:sl1='%2n\:\ %<%1*%f%0*\ [%{Show_List()}%{Show_Case()}%{Show_Tabstop()}%{Show_Paste()}%{Show_VirtualEdit()}%{Show_Undo()}%Y%M%R]%{Show_Alt()}\ '
   let l:sl3='L:%1*%4.6l%0*/%-4.6L\ C:%1*%3.6c%0*\ \|\ %P'
   let l:hexformat='%b'
   if b:iainhex
@@ -1179,6 +1215,93 @@ let g:p4Presets='P4CONFIG'
 " BufExplorer.
 let g:bufExplorerShowRelativePath=1
 let g:bufExplorerSplitOutPathName=0
+
+" NERDcommenter.
+let g:NERDSpaceDelims=1
+endif "}}}1
+
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Handle options only available in Vim 7.3 and above.
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+if version >= "703" "{{{1
+version 7.3
+
+" Toggle persistent undo with \u.
+call Mapping("u", ":call <SID>Cycle_Undo()<CR>:<CR>")
+" Remove persistent undo file with \U.
+call Mapping("U", ":call <SID>Clear_Undo()<CR>:<CR>")
+
+" Use a persistent undo file if it exists.
+fun! <SID>Check_Undo() "{{{2
+  if filereadable(undofile(expand("%")))
+    setlocal undofile
+  endif
+endfun "}}}2
+
+" Toggle persistent undo for this buffer.
+fun! <SID>Cycle_Undo() "{{{2
+  if has("persistent_undo")
+    let &undofile = ! &undofile
+  endif
+endfun "}}}2
+
+" Remove the persistent undo file for this buffer.
+fun! <SID>Clear_Undo() "{{{2
+  if ! has("persistent_undo")
+    return
+  endif
+
+  setlocal noundofile
+
+  let l:f = expand("%")
+  if l:f == ""
+    return
+  endif
+
+  let l:u = undofile(l:f)
+  if l:u == ""
+    return
+  endif
+
+  if ! filereadable(l:u) || ! filewritable(l:u)
+    return
+  endif
+
+  call delete(l:u)
+endfun "}}}2
+
+" Toggle ColorColumn at cursor position.
+fun! <SID>Cycle_ColorColumn() "{{{2
+  if ! has("syntax")
+    return
+  endif
+
+  let l:cc = &colorcolumn
+  let l:column = col(".")
+  let l:re = ",*\\<" . l:column . "\\>"
+  if l:cc =~# l:re
+    let l:cc = substitute(l:cc, l:re, "", "g")
+  else
+    let l:cc = l:cc . "," . l:column
+  endif
+  let &colorcolumn = substitute(l:cc, "^,*", "", "")
+endfun "}}}2
+
+if has("syntax")
+  " Enable showing ColorColumn at cursor position with \CC.
+  call Mapping("CC", ":call <SID>Cycle_ColorColumn()<CR>:<CR>")
+  " Remove last shown ColorColumn with \Cc.
+  call Mapping("Cc", ":let &colorcolumn=substitute(&colorcolumn, \",*[0-9]*$\", \"\", \"\")<CR>:<CR>")
+  " Remove all ColorColumns with \Cx.
+  call Mapping("Cx", ":se colorcolumn=<CR>:<CR>")
+endif
+
+" Use persistent undo if available.
+if has("autocmd")
+  if has("persistent_undo")
+    au File BufReadPost * call <SID>Check_Undo()
+  endif
+endif
 endif "}}}1
 
 " Resize after startup.