X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.vimrc;h=6e3726c1267c85dd5348a8fa46afc371004124dd;hp=d29cc402159feed885d75e219224851e571697db;hb=c01aaa750e997a9603137d449cd924332b39307d;hpb=6e4ae53cf4de6aa433d900f1f1780697ba092f0d

diff --git a/.vimrc b/.vimrc
index d29cc40..6e3726c 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,5 +1,5 @@
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Multi-version vimrc compatible with version 4 and above.   vim:set fdm=marker:
+" Multi-version vimrc compatible with version 4 and above.   vim6:set fdm=marker:
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
 " Note that "if <condition> | call Something() | endif" syntax is unsupported
@@ -425,41 +425,58 @@ 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
+    let l:args = "\\" . a:keysequence . " " . a:mapping . ":<CR>"
   else
-    exec "map <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
 
 " Use - and = to create underlines.
-call Mapping("-", "yyp:s/./-/g<RETURN>:let @/=''<RETURN>:<RETURN>")
-call Mapping("=", "yyp:s/./=/g<RETURN>:let @/=''<RETURN>:<RETURN>")
-
-" Change to ts=2 with \2.
-call Mapping("2", ":se ts=2<CR>:<CR>")
-" Change to ts=4 with \4.
-call Mapping("4", ":se ts=4<CR>:<CR>")
-" Change to ts=8 with \8.
-call Mapping("8", ":se ts=8<CR>:<CR>")
-" Change to ts=16 with \6.
-call Mapping("6", ":se ts=16<CR>:<CR>")
-" Change to ts=32 with \3.
-call Mapping("3", ":se ts=32<CR>:<CR>")
+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", ":call Tab_Width(2)<CR>")
+" Set 4-column tabs with \4.
+call Mapping("4", ":call Tab_Width(4)<CR>")
+" Set 8-column tabs with \8.
+call Mapping("8", ":call Tab_Width(8)<CR>")
+" Set 16-column tabs with \6.
+call Mapping("6", ":call Tab_Width(16)<CR>")
+" Set 32-column tabs with \3.
+call Mapping("3", ":call Tab_Width(32)<CR>")
 " Toggle paste mode with \p.
-call Mapping("p", ":se paste!<CR>:<CR>")
+call Mapping("p", ":se paste!<CR>")
 " Swap case-sensitivity with \c.
-call Mapping("C", ":call Invert_Case()<CR>:<CR>")
+call Mapping("C", ":call Invert_Case()<CR>")
 " Change number mode with \n.
-call Mapping("n", ":call Number(1)<CR>:<CR>")
+call Mapping("n", ":call Number(1)<CR>")
 " Expand or shrink window size with \> and \<.
-call Mapping(">", ":call Resize_Columns('+')<CR>:<CR>")
-call Mapping("<", ":call Resize_Columns('-')<CR>:<CR>")
+call Mapping(">", ":call Resize_Columns('+')<CR>")
+call Mapping("<", ":call Resize_Columns('-')<CR>")
 " Clear search pattern with \/.
-call Mapping("/", ":let @/=\"\"<CR>:<CR>")
+call Mapping("/", ":let @/=\"\"<CR>")
 " Toggle alternate buffer name with \#.
-call Mapping("#", ":call Cycle_Alt()<CR>:<CR>")
+call Mapping("#", ":call Cycle_Alt()<CR>")
 
 " Set graphical window title.
 if has("win32") || has("win64")
@@ -638,6 +655,11 @@ version 5.4
 " Reuse windows when using sbuffer.
 se switchbuf=useopen
 
+" Vim 5 requires a 'n setting for viminfo.
+if ! &viminfo
+  se viminfo='100
+endif
+
 " Allow persistent variable saving for localvimrc.
 se viminfo+=!
 
@@ -662,17 +684,60 @@ fun! Has_Unicode() "{{{2
   return 0
 endfun "}}}2
 
+" Helper for status line.
+" Show file encoding
+fun! Show_Encoding() "{{{2
+  if version < "600"
+    return ""
+  endif
+
+  let l:enc = &fenc
+  let l:symbol = ""
+  if l:enc == ""
+    let l:enc = &enc
+    if l:enc == ""
+      return ""
+    endif
+    if bufname("%") == ""
+      if Has_Unicode()
+        let l:symbol = '•'
+      else
+        let l:symbol = '*'
+      endif
+    endif
+  endif
+
+  if has("multi_byte")
+    if &bomb
+      if Has_Unicode()
+        let l:symbol = "☻"
+      else
+        let l:symbol = "@"
+      endif
+    endif
+  endif
+
+  " Don't return anything if the encoding is utf-8.
+  if l:enc == "utf-8"
+    if l:symbol == ""
+      return ""
+    endif
+  endif
+
+  return l:symbol . l:enc . ","
+endfun "}}}2
+
 " Helper for status line.
 " Show space, underscore or dollar sign depending on list mode.
 fun! Show_List() "{{{2
   call Iain_Vars()
   if w:iainlist == 0
     " No list.
-    return " "
+    return ""
   elseif Has_Unicode()
     if w:iainlist == 1
       " Just tabs.
-      return "»"
+      return "⇥"
     else
       " Full list.
       return "¶"
@@ -696,10 +761,27 @@ fun! Show_Case() "{{{2
   endif
 endfun "}}}2
 
+" Helper for status line.
+" Mark DOS buffers.
+fun! Show_DOS() "{{{2
+  if &ff == "unix"
+    return ""
+  endif
+  return &ff . ","
+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.
@@ -793,14 +875,88 @@ fun! Show_SearchForward() "{{{2
   return ""
 endfun "}}}2
 
+" Helper for status line.
+" Show marks set in cursor line.
+fun! Show_Marks() "{{{2
+  if ! exists("g:iainsigns")
+    return ""
+  endif
+
+  let l:marks = ""
+
+  let l:signs = g:iainsigns
+  let l:sign = ""
+  let l:cursorline = line(".")
+  while strlen(l:signs)
+    let l:sign = matchstr(l:signs, '^[A-Za-z]\+\(:.\)*[.=>-][^ ]\+')
+    let l:sign = substitute(l:sign, '^[A-Za-z]\+', "", "")
+    let l:ascii = matchstr(l:sign, '^:.')
+    let l:mark = substitute(l:sign, '^\(:.\)*[.=>-]', "", "")
+    if strlen(l:ascii)
+      let l:ascii = substitute(l:ascii, '^:', "", "")
+    else
+      let l:ascii = l:mark
+    endif
+    let l:ascii = substitute(l:ascii, '"', '\\"', "")
+
+    if l:ascii == "o"
+      let l:line = "."
+    else
+      let l:line = "'" . l:ascii
+    endif
+
+    " Ignore cursor line which will always match.
+    if l:line != "."
+      if l:cursorline == line(l:line)
+        let l:marks = l:marks . l:mark
+      endif
+    endif
+
+    let l:signs = substitute(l:signs, '^[^ ]\+ *', "", "")
+  endwhile
+
+  if l:marks == ""
+    return ""
+  else
+    return "M:" . l:marks . " "
+  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")
     return
   endif
   call Iain_Vars()
-  let l:sl1='%2n\:\ %<%1*%f%0*\ [%{Show_List()}%{Show_Bind()}%{Show_Case()}%{Show_Tabstop()}%{Show_Paste()}%{Show_VirtualEdit()}%{Show_Undo()}%Y%M%R%{Show_SearchForward()}]%{Show_Alt()}\ '
-  let l:sl3='L:%1*%4.6l%0*/%-4.6L\ C:%1*%3.6c%V%0*\ \|\ %P'
+
+  " User{N} highlights %{N}*.
+  " Named highlight groups %#group% aren't available until Vim 7.
+  let l:normal = '%0*'
+  let l:bold = '%1*'
+
+  " 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_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
     let l:hexformat='0\x%02B'
@@ -1045,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:•'
@@ -1108,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
@@ -1116,34 +1272,34 @@ fun! Extra_Whitespace_Match() "{{{2
 endfun "}}}2
 
 " Swap hex/decimal statusline with \x.
-call Mapping("x", ":call Cycle_HexStatusLine()<CR>:<CR>")
+call Mapping("x", ":call Cycle_HexStatusLine()<CR>")
 " Change statusline verbosity with \v.
-call Mapping("V", ":call Cycle_VerboseStatusLine()<CR>:<CR>")
+call Mapping("V", ":call Cycle_VerboseStatusLine()<CR>")
 " Cycle list styles with \l.
-call Mapping("l", ":call Cycle_List()<CR>:<CR>")
+call Mapping("l", ":call Cycle_List()<CR>")
 " Toggle tags with \t.
 call Mapping("t", ":Tlist<CR>")
 " Change foldmethod with \f.
-call Mapping("f", ":se foldenable!<CR>:<CR>")
+call Mapping("f", ":se foldenable!<CR>")
 " Toggle quickfix window with \q.
-call Mapping("q", ":call Cycle_Quickfix()<CR>:<CR>")
+call Mapping("q", ":call Cycle_Quickfix()<CR>")
 " Rerun filetype detection with \s.  The s is for syntax, as this will be
 " updated as a side-effect.
-call Mapping("S", ":filetype detect<CR>:<CR>")
+call Mapping("S", ":filetype detect<CR>")
 " Toggle marks with \m.
-call Mapping("m", ":call <SID>Cycle_Signs(1)<CR>:<CR>")
+call Mapping("m", ":call <SID>Cycle_Signs(1)<CR>")
 
 if has("autocmd")
   " Show signs by default.
   au Display VimEnter * call <SID>Cycle_Signs(0)
 endif
-endif "}}}1
 
 " move.
 nmap <A-u> <Plug>MoveLineHalfPageUp
 nmap <A-d> <Plug>MoveLineHalfPageDown
 vmap <A-u> <Plug>MoveBlockHalfPageUp
 vmap <A-d> <Plug>MoveBlockHalfPageDown
+endif "}}}1
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Handle options only available in Vim 7 and above.
@@ -1151,6 +1307,11 @@ vmap <A-d> <Plug>MoveBlockHalfPageDown
 if version >= "700" "{{{1
 version 7.0
 
+" Narrow buffer with \w.
+call Mapping("w", ":NarrowRegion<CR>", "n", "v")
+" Narrow window with \W.
+call Mapping("W", ":NarrowWindow<CR>", "n", "v")
+
 " Helper to show tab name.
 fun! <SID>TabName(label, gui) "{{{2
   let l:label = a:label
@@ -1182,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("$")
@@ -1318,7 +1487,6 @@ let g:bufExplorerSplitOutPathName=0
 
 " NERDcommenter.
 let g:NERDSpaceDelims=1
-endif "}}}1
 
 " localvimrc.
 let g:localvimrc_persistent=1
@@ -1326,6 +1494,7 @@ let g:localvimrc_persistent=1
 " Gitv.
 let g:Gitv_OpenHorizontal='auto'
 let g:Gitv_WipeAllOnClose=1
+endif "}}}1
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Handle options only available in Vim 7.2 and above.
@@ -1383,12 +1552,12 @@ if version >= "703" "{{{1
 version 7.3
 
 " Toggle persistent undo with \u.
-call Mapping("u", ":call <SID>Cycle_Undo()<CR>:<CR>")
+call Mapping("u", ":call <SID>Cycle_Undo()<CR>")
 " Remove persistent undo file with \U.
-call Mapping("U", ":call <SID>Clear_Undo()<CR>:<CR>")
+call Mapping("U", ":call <SID>Clear_Undo()<CR>")
 
 " Toggle gundo window with \g.
-call Mapping("g", ":call gundo#GundoToggle()<CR>:<CR>")
+call Mapping("g", ":call gundo#GundoToggle()<CR>")
 
 " Use a persistent undo file if it exists.
 fun! <SID>Check_Undo() "{{{2
@@ -1448,11 +1617,11 @@ endfun "}}}2
 
 if has("syntax")
   " Enable showing ColorColumn at cursor position with \CC.
-  call Mapping("CC", ":call <SID>Cycle_ColorColumn()<CR>:<CR>")
+  call Mapping("CC", ":call <SID>Cycle_ColorColumn()<CR>")
   " Remove last shown ColorColumn with \Cc.
-  call Mapping("Cc", ":let &colorcolumn=substitute(&colorcolumn, \",*[0-9]*$\", \"\", \"\")<CR>:<CR>")
+  call Mapping("Cc", ":let &colorcolumn=substitute(&colorcolumn, \",*[0-9]*$\", \"\", \"\")<CR>")
   " Remove all ColorColumns with \Cx.
-  call Mapping("Cx", ":se colorcolumn=<CR>:<CR>")
+  call Mapping("Cx", ":se colorcolumn=<CR>")
 endif
 
 " Use persistent undo if available.