Make vim toggles verbose, use `ctrl-z` for `fg`

vim/vimrc

@@ -90,13 +90,13 @@ nnoremap Y y$
 " Remap vim's 'increment next number' to <C-b> since <C-a> is used by tmux.
 nnoremap <C-b> <C-a>
 
-nnoremap <silent> <leader>w :set wrap!<CR>
+nnoremap <silent> <leader>w :set wrap! wrap?<CR>
 
 " Toggle paste mode - no autoindenting of pasted material
 nnoremap <silent> <leader>p :set paste! paste?<CR>
 
 " Toggle visible whitespace characters
-nnoremap <silent> <leader>l :set list!<CR>
+nnoremap <silent> <leader>l :set list! list?<CR>
 
 " Toggle scrollbind for moving multiple splits in sync together
 nnoremap <silent> <leader>s :set scrollbind! scrollbind?<CR>

zsh/custom/ctrl-z.zsh

@@ -0,0 +1,13 @@
+# From http://sheerun.net/2014/03/21/how-to-boost-your-vim-productivity/
+# Perhaps the one actually-good idea from this post.
+fancy-ctrl-z () {
+  if [[ $#BUFFER -eq 0 ]]; then
+    BUFFER="fg"
+    zle accept-line
+  else
+    zle push-input
+    zle clear-screen
+  fi
+}
+zle -N fancy-ctrl-z
+bindkey '^Z' fancy-ctrl-z