From a8b1ea7fdeaf53cebb80b41f36492e80242efcde Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop@gmail.com>
Date: Sat, 8 Dec 2012 11:30:50 -0500
Subject: [PATCH] more mapping cleanup - avoid setting named mark

---
 vimrc | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/vimrc b/vimrc
index 932e8e3..37be12c 100644
--- a/vimrc
+++ b/vimrc
@@ -68,13 +68,12 @@ map <Leader>C# :set paste<CR>O<Esc>75A#<Esc>yypO# <Esc>:set nopaste<CR>A
 map <Leader>c# :set paste<CR>o<Esc>75A#<Esc>yypO# <Esc>:set nopaste<CR>A
 map <Leader>C* :set paste<CR>O/<Esc>74A*<Esc>o <Esc>73A*<Esc>A/<Esc>O * <Esc>:set nopaste<CR>A
 map <Leader>c* :set paste<CR>o/<Esc>74A*<Esc>o <Esc>73A*<Esc>A/<Esc>O * <Esc>:set nopaste<CR>A
-map <Leader>; :set paste<CR>O;<Esc>74A*<Esc>o;*<Esc>72A <Esc>A*<Esc>o;<Esc>74A*<Esc>0klll:set nopaste<CR>R
-map <Leader>8 :set paste<CR>o<Esc>20A-<Esc>A8<<Esc>20A-<Esc>:set nopaste<CR>0
-map <Leader>m mz:%s/<C-Q><CR>//g<CR>:noh<CR>`z
+map <Leader>c; :set paste<CR>O;<Esc>74A*<Esc>o;*<Esc>72A <Esc>A*<Esc>o;<Esc>74A*<Esc>0klll:set nopaste<CR>R
+map <Leader>c8 :set paste<CR>o<Esc>20A-<Esc>A8<<Esc>20A-<Esc>:set nopaste<CR>0
+map <Leader>m m`:%s/<C-Q><CR>//g<CR>:noh<CR>``
 map <Leader>t :tabn<CR>
 map <Leader>T :tabp<CR>
-map <Leader>s mz:%s/\v\s+$//<CR>`z
-map <Leader>f :set ts=8<CR>:retab<CR>:set ts=4<CR>
+map <Leader>s m`:%s/\v\s+$//<CR>``
 " jump to tag in a new tab
 map <Leader>w :tab :tag <C-R><C-W><CR>
 " re-indent the following line how vim would automatically do it