From e2bed57b6ae33a67e3e73bc1e9169a43662a4b15 Mon Sep 17 00:00:00 2001
From: Tony Duckles <tony@nynim.org>
Date: Sun, 25 Aug 2013 16:05:37 -0500
Subject: [PATCH] .vimrc: Add list-whitespace-chars toggle

Add <leader>ws for toggling list-mode -- showing unprintable chars
like trailing white-space and hard-tabs.

Other changes:
* Use ":set {{flag}}!" syntax for toggling boolean variables rather
  than ":set inv{{flag}}" syntax.
* Simplify strip-trailing-whitespace helper.
---
 .vimrc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.vimrc b/.vimrc
index fb6e632..280f476 100644
--- a/.vimrc
+++ b/.vimrc
@@ -175,7 +175,7 @@ let mapleader = ","
 nnoremap <silent> <Space> :nohlsearch<Bar>:echo<CR>
 
 " <F2> to pastetoggle, to turn-off autoindent when pasting from system clipboard
-nnoremap <F2> :set invpaste paste?<CR>
+nnoremap <F2> :set paste! paste?<CR>
 set pastetoggle=<F2>
 
 " <F4> to toggle NERDTreee
@@ -249,7 +249,10 @@ nmap <leader>L mQgewvu`Q
 nmap <silent> <leader>cd :lcd %:h<CR>
 
 " set text wrapping toggles
-nmap <silent> <leader>tw :set invwrap<CR>:set wrap?<CR>
+nmap <silent> <leader>tw :set wrap! wrap?<CR>
+
+" set list-whitespace-chars toggle
+nmap <silent> <leader>ws :set list! list?<CR>
 
 " find merge conflict markers
 nmap <silent> <leader>fc <ESC>/\v^[<=>]{7}( .*\|$)<CR>
@@ -258,10 +261,7 @@ nmap <silent> <leader>fc <ESC>/\v^[<=>]{7}( .*\|$)<CR>
 nmap <silent> <leader>hs :set hlsearch! hlsearch?<CR>
 
 " strip all trailing whitespace in file
-function! StripWhitespace ()
-  exec ':%s/ \+$//gc'
-endfunction
-map <leader>s :call StripWhitespace ()<CR>
+nmap <silent> <leader>s :%s/\s\+$//<CR>
 
 " toggle diffmode for a buffer
 function! DiffToggle()
-- 
2.45.2