X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.vimrc;h=6e561c6e8db6ac86c4ffbe5d37d0b78a8e6e33c7;hp=21e3877fc26e1227358eef5a8410a1c8e9a17b1a;hb=0e802cdc4141d6d20356c83ac14207ff747aaed1;hpb=74d08aad488b6e7f74f5252cd5f313958bcdc08a diff --git a/.vimrc b/.vimrc index 21e3877..6e561c6 100644 --- a/.vimrc +++ b/.vimrc @@ -425,41 +425,58 @@ fun! MakeMode_unmap() "{{{2 endfun "}}}2 " Function to create mappings with either a hardcoded \ or . -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 . ":" else - exec "map " . a:keysequence . " " . a:mapping + let l:args = " " . 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:let @/='':") -call Mapping("=", "yyp:s/./=/g:let @/='':") +call Mapping("-", "yyp:s/./-/g:let @/=''") +call Mapping("=", "yyp:s/./=/g:let @/=''") + +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:se sw=2:") +call Mapping("2", ":call Tab_Width(2)") " Set 4-column tabs with \4. -call Mapping("4", ":se ts=4:se sw=4:") +call Mapping("4", ":call Tab_Width(4)") " Set 8-column tabs with \8. -call Mapping("8", ":se ts=8:se sw=8:") +call Mapping("8", ":call Tab_Width(8)") " Set 16-column tabs with \6. -call Mapping("6", ":se ts=16:se sw=16:") +call Mapping("6", ":call Tab_Width(16)") " Set 32-column tabs with \3. -call Mapping("3", ":se ts=32:se sw=32:") +call Mapping("3", ":call Tab_Width(32)") " Toggle paste mode with \p. -call Mapping("p", ":se paste!:") +call Mapping("p", ":se paste!") " Swap case-sensitivity with \c. -call Mapping("C", ":call Invert_Case():") +call Mapping("C", ":call Invert_Case()") " Change number mode with \n. -call Mapping("n", ":call Number(1):") +call Mapping("n", ":call Number(1)") " Expand or shrink window size with \> and \<. -call Mapping(">", ":call Resize_Columns('+'):") -call Mapping("<", ":call Resize_Columns('-'):") +call Mapping(">", ":call Resize_Columns('+')") +call Mapping("<", ":call Resize_Columns('-')") " Clear search pattern with \/. -call Mapping("/", ":let @/=\"\":") +call Mapping("/", ":let @/=\"\"") " Toggle alternate buffer name with \#. -call Mapping("#", ":call Cycle_Alt():") +call Mapping("#", ":call Cycle_Alt()") " Set graphical window title. if has("win32") || has("win64") @@ -897,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") @@ -912,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 @@ -1229,22 +1264,22 @@ fun! Extra_Whitespace_Match() "{{{2 endfun "}}}2 " Swap hex/decimal statusline with \x. -call Mapping("x", ":call Cycle_HexStatusLine():") +call Mapping("x", ":call Cycle_HexStatusLine()") " Change statusline verbosity with \v. -call Mapping("V", ":call Cycle_VerboseStatusLine():") +call Mapping("V", ":call Cycle_VerboseStatusLine()") " Cycle list styles with \l. -call Mapping("l", ":call Cycle_List():") +call Mapping("l", ":call Cycle_List()") " Toggle tags with \t. call Mapping("t", ":Tlist") " Change foldmethod with \f. -call Mapping("f", ":se foldenable!:") +call Mapping("f", ":se foldenable!") " Toggle quickfix window with \q. -call Mapping("q", ":call Cycle_Quickfix():") +call Mapping("q", ":call Cycle_Quickfix()") " Rerun filetype detection with \s. The s is for syntax, as this will be " updated as a side-effect. -call Mapping("S", ":filetype detect:") +call Mapping("S", ":filetype detect") " Toggle marks with \m. -call Mapping("m", ":call Cycle_Signs(1):") +call Mapping("m", ":call Cycle_Signs(1)") if has("autocmd") " Show signs by default. @@ -1265,9 +1300,9 @@ if version >= "700" "{{{1 version 7.0 " Narrow buffer with \w. -call Mapping("w", ":NarrowRegion:") +call Mapping("w", ":NarrowRegion", "n", "v") " Narrow window with \W. -call Mapping("W", ":NarrowWindow:") +call Mapping("W", ":NarrowWindow", "n", "v") " Helper to show tab name. fun! TabName(label, gui) "{{{2 @@ -1501,12 +1536,12 @@ if version >= "703" "{{{1 version 7.3 " Toggle persistent undo with \u. -call Mapping("u", ":call Cycle_Undo():") +call Mapping("u", ":call Cycle_Undo()") " Remove persistent undo file with \U. -call Mapping("U", ":call Clear_Undo():") +call Mapping("U", ":call Clear_Undo()") " Toggle gundo window with \g. -call Mapping("g", ":call gundo#GundoToggle():") +call Mapping("g", ":call gundo#GundoToggle()") " Use a persistent undo file if it exists. fun! Check_Undo() "{{{2 @@ -1566,11 +1601,11 @@ endfun "}}}2 if has("syntax") " Enable showing ColorColumn at cursor position with \CC. - call Mapping("CC", ":call Cycle_ColorColumn():") + call Mapping("CC", ":call Cycle_ColorColumn()") " Remove last shown ColorColumn with \Cc. - call Mapping("Cc", ":let &colorcolumn=substitute(&colorcolumn, \",*[0-9]*$\", \"\", \"\"):") + call Mapping("Cc", ":let &colorcolumn=substitute(&colorcolumn, \",*[0-9]*$\", \"\", \"\")") " Remove all ColorColumns with \Cx. - call Mapping("Cx", ":se colorcolumn=:") + call Mapping("Cx", ":se colorcolumn=") endif " Use persistent undo if available.