Typo.

[profile.git] / .vimrc

diff --git a/.vimrc b/.vimrc
index f572ab2..cc97b1e 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -449,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.
@@ -909,6 +914,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")
@@ -924,7 +947,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