X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.vimrc;h=a72c2dcf7297427d722b3affa0c9a0bd6d050b77;hp=8c8f8f980942df0bd23b017e2cc0d88730c203f1;hb=edf8df9b6f669de383f8763daf87af730c22536a;hpb=818d30c4f33a7609b216b4ca4b34bf82a788d5d2

diff --git a/.vimrc b/.vimrc
index 8c8f8f9..a72c2dc 100644
--- a/.vimrc
+++ b/.vimrc
@@ -425,11 +425,23 @@ fun! MakeMode_unmap() "{{{2
 endfun "}}}2
 
 " Function to create mappings with either a hardcoded \ or <Leader>.
-fun! Mapping(keysequence,mapping) "{{{2
+fun! Mapping(keysequence, mapping, ...) "{{{2
   if version < "600"
-    exec "map \\" . a:keysequence . " " . a:mapping . ":<CR>"
+    let l:args = "\\" . a:keysequence . " " . a:mapping . ":<CR>"
   else
-    exec "map <silent> <Leader>" . a:keysequence . " " . a:mapping
+    let l:args = "<silent> <Leader>" . a:keysequence . " " . a:mapping
+  endif
+  if a:0 == 0
+    " General mapping.
+    exec "map " . l:args
+  else
+    " Specific mapping(s).
+    let l:i = 1
+    while l:i <= a:0
+      exec "let l:map = a:" . l:i . " . \"map\""
+      exec l:map . " " . l:args
+      let l:i = l:i + 1
+    endwhile
   endif
 endfun "}}}2
 
@@ -437,16 +449,21 @@ endfun "}}}2
 call Mapping("-", "yyp:s/./-/g<CR>:let @/=''<CR>")
 call Mapping("=", "yyp:s/./=/g<CR>:let @/=''<CR>")
 
+fun! Tab_Width(width) "{{{2
+  exec "set sw=" . a:width
+  exec "set ts=" . a:width
+endfun "}}}2
+
 " Set 2-column tabs with \2.
-call Mapping("2", ":se ts=2<CR>:se sw=2<CR>")
+call Mapping("2", ":call Tab_Width(2)<CR>")
 " Set 4-column tabs with \4.
-call Mapping("4", ":se ts=4<CR>:se sw=4<CR>")
+call Mapping("4", ":call Tab_Width(4)<CR>")
 " Set 8-column tabs with \8.
-call Mapping("8", ":se ts=8<CR>:se sw=8<CR>")
+call Mapping("8", ":call Tab_Width(8)<CR>")
 " Set 16-column tabs with \6.
-call Mapping("6", ":se ts=16<CR>:se sw=16<CR>")
+call Mapping("6", ":call Tab_Width(16)<CR>")
 " Set 32-column tabs with \3.
-call Mapping("3", ":se ts=32<CR>:se sw=32<CR>")
+call Mapping("3", ":call Tab_Width(32)<CR>")
 " Toggle paste mode with \p.
 call Mapping("p", ":se paste!<CR>")
 " Swap case-sensitivity with \c.
@@ -720,7 +737,7 @@ fun! Show_List() "{{{2
   elseif Has_Unicode()
     if w:iainlist == 1
       " Just tabs.
-      return "»"
+      return "⇥"
     else
       " Full list.
       return "¶"
@@ -756,7 +773,15 @@ endfun "}}}2
 " Helper for status line.
 " Show the size of the tabstop.
 fun! Show_Tabstop() "{{{2
-  return &ts
+  if &et
+    return &ts
+  else
+    if Has_Unicode()
+      return &ts . "↹"
+    else
+      return &ts . "\\"
+    fi
+  endif
 endfun "}}}2
 
 " Helper for status line.
@@ -897,6 +922,24 @@ fun! Show_Marks() "{{{2
   endif
 endfun "}}}2
 
+" Helper for status lines.
+" Show Space plugin command.
+fun! Show_Space() "{{{2
+  if exists("*GetSpaceMovement")
+    let l:ret = GetSpaceMovement()
+    if l:ret != ""
+      if Has_Unicode()
+        let l:ret = "▭" . l:ret . Show_SearchForward()
+      else
+        let l:ret = "[" . l:ret . Show_SearchForward() . "]"
+      endif
+    endif
+    return l:ret
+  else
+    return Show_SearchForward()
+  endif
+endfun "}}}2
+
 " Show the status line.
 fun! Show_StatusLine() "{{{2
   if ! has("statusline")
@@ -912,7 +955,7 @@ fun! Show_StatusLine() "{{{2
   " sl1 contains left-aligned stuff.
   " sl2 contains stuff shown only when verbose mode is enabled.
   " sl3 contains right-aligned stuff.
-  let l:sl1='%2n\:\ %<' . l:bold . '%f' . l:normal . '\ [%{Show_Encoding()}%{Show_DOS()}%{Show_List()}%{Show_Bind()}%{Show_Case()}%{Show_Tabstop()}%{Show_Paste()}%{Show_VirtualEdit()}%{Show_Undo()}%Y%M%R%{Show_SearchForward()}]%{Show_Alt()}\ '
+  let l:sl1='%2n\:\ %<' . l:bold . '%f' . l:normal . '\ [%{Show_Encoding()}%{Show_DOS()}%{Show_List()}%{Show_Bind()}%{Show_Case()}%{Show_Tabstop()}%{Show_Paste()}%{Show_VirtualEdit()}%{Show_Undo()}%Y%M%R%{Show_Space()}]%{Show_Alt()}\ '
   let l:sl3='%{Show_Marks()}L:' . l:bold . '%4.6l' . l:normal . '/%-4.6L\ C:' . l:bold . '%3.6c%V' . l:normal . '\ \|\ %P'
   let l:hexformat='%b'
   if b:iainhex
@@ -1158,7 +1201,7 @@ endfun "}}}2
 fun! Cycle_List() "{{{2
   " Pretty UTF-8 listchars.
   if Has_Unicode()
-    let basic='tab:»·,trail:…,extends:«,precedes:»'
+    let basic='tab:⇥·,trail:…,extends:«,precedes:»'
     let eol='eol:¶'
     if version >= "700"
       let basic=basic . ',nbsp:•'
@@ -1221,7 +1264,7 @@ fun! Cycle_Alt() "{{{2
   call Iain_Vars()
   let b:iainalt = ! b:iainalt
   call Show_StatusLine()
-endfun "{{{2
+endfun "}}}2
 
 " To be overridden later if applicable.
 fun! Extra_Whitespace_Match() "{{{2
@@ -1265,9 +1308,9 @@ if version >= "700" "{{{1
 version 7.0
 
 " Narrow buffer with \w.
-call Mapping("w", ":NarrowRegion<CR>")
+call Mapping("w", ":NarrowRegion<CR>", "n", "v")
 " Narrow window with \W.
-call Mapping("W", ":NarrowWindow<CR>")
+call Mapping("W", ":NarrowWindow<CR>", "n", "v")
 
 " Helper to show tab name.
 fun! <SID>TabName(label, gui) "{{{2
@@ -1300,7 +1343,15 @@ endfun "}}}2
 
 " Tab line.
 fun! Show_TabLine() "{{{2
-  let l:s = "%#TabLineFill#Tabs:"
+  let l:colwidth = &numberwidth
+  if g:marksigns
+    let l:colwidth += 2
+  endif
+  if &diff == 1
+    let l:colwidth += 2
+  endif
+  let l:fmt = printf("%%s%% %ds", l:colwidth)
+  let l:s = printf(l:fmt, "%#TabLineFill#", "Tabs ")
 
   let l:i = 0
   while l:i < tabpagenr("$")
@@ -1505,8 +1556,27 @@ call Mapping("u", ":call <SID>Cycle_Undo()<CR>")
 " Remove persistent undo file with \U.
 call Mapping("U", ":call <SID>Clear_Undo()<CR>")
 
-" Toggle gundo window with \g.
-call Mapping("g", ":call gundo#GundoToggle()<CR>")
+" Toggle Undotree window with \g.
+call Mapping("g", ":UndotreeToggle<CR>")
+" Switch to Undotree window with \G.
+call Mapping("g", ":UndotreeToggle<CR>")
+" Undotree gets focus.
+let g:undotree_SetFocusWhenToggle=1
+" Undotree uses context diff.
+let g:undotree_DiffCommand="diff -u"
+" Undotree bullet.
+if Has_Unicode()
+  let g:undotree_TreeNodeShape="•"
+endif
+" Undotree bindings emulate Gundo.
+fun! g:Undotree_CustomMap() "{{{2
+  nmap <buffer> k <plug>UndotreeGoNextState
+  nmap <buffer> j <plug>UndotreeGoPreviousState
+  nmap <buffer> K <plug>UndotreeGoNextSaved
+  nmap <buffer> J <plug>UndotreeGoPreviousSaved
+  nmap <buffer> <CR> <plug>UndotreeFocusTarget
+endfun "}}}2
+
 
 " Use a persistent undo file if it exists.
 fun! <SID>Check_Undo() "{{{2