From: Iain Patterson <me@iain.cx>
Date: Wed, 26 Feb 2014 10:54:30 +0000 (+0000)
Subject: Use silent mappings where possible.
X-Git-Url: http://git.iain.cx/?a=commitdiff_plain;h=818d30c4f33a7609b216b4ca4b34bf82a788d5d2;p=profile.git

Use silent mappings where possible.

The Mapping() function was being called with ":<CR>" appended to every
mapping so that executing the mapping would not leave the expanded
command in the ruler.

On Vim 6 and later the correct way to execute the mapping discreetly is
to use <silent> and even on Vim 5 it is more appropriate to append the
":<CR>" within the Mapping() function.
---

diff --git a/.vimrc b/.vimrc
index 21e3877..8c8f8f9 100644
--- a/.vimrc
+++ b/.vimrc
@@ -427,39 +427,39 @@ endfun "}}}2
 " Function to create mappings with either a hardcoded \ or <Leader>.
 fun! Mapping(keysequence,mapping) "{{{2
   if version < "600"
-    exec "map \\" . a:keysequence . " " . a:mapping
+    exec "map \\" . a:keysequence . " " . a:mapping . ":<CR>"
   else
-    exec "map <Leader>" . a:keysequence . " " . a:mapping
+    exec "map <silent> <Leader>" . a:keysequence . " " . a:mapping
   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>")
+call Mapping("-", "yyp:s/./-/g<CR>:let @/=''<CR>")
+call Mapping("=", "yyp:s/./=/g<CR>:let @/=''<CR>")
 
 " Set 2-column tabs with \2.
-call Mapping("2", ":se ts=2<CR>:se sw=2<CR>:<CR>")
+call Mapping("2", ":se ts=2<CR>:se sw=2<CR>")
 " Set 4-column tabs with \4.
-call Mapping("4", ":se ts=4<CR>:se sw=4<CR>:<CR>")
+call Mapping("4", ":se ts=4<CR>:se sw=4<CR>")
 " Set 8-column tabs with \8.
-call Mapping("8", ":se ts=8<CR>:se sw=8<CR>:<CR>")
+call Mapping("8", ":se ts=8<CR>:se sw=8<CR>")
 " Set 16-column tabs with \6.
-call Mapping("6", ":se ts=16<CR>:se sw=16<CR>:<CR>")
+call Mapping("6", ":se ts=16<CR>:se sw=16<CR>")
 " Set 32-column tabs with \3.
-call Mapping("3", ":se ts=32<CR>:se sw=32<CR>:<CR>")
+call Mapping("3", ":se ts=32<CR>:se sw=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")
@@ -1229,22 +1229,22 @@ 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.
@@ -1265,9 +1265,9 @@ if version >= "700" "{{{1
 version 7.0
 
 " Narrow buffer with \w.
-call Mapping("w", ":NarrowRegion<CR>:<CR>")
+call Mapping("w", ":NarrowRegion<CR>")
 " Narrow window with \W.
-call Mapping("W", ":NarrowWindow<CR>:<CR>")
+call Mapping("W", ":NarrowWindow<CR>")
 
 " Helper to show tab name.
 fun! <SID>TabName(label, gui) "{{{2
@@ -1501,12 +1501,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
@@ -1566,11 +1566,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.