f182e04d95c5

--- a/vim/.vimrc	Thu Apr 07 14:25:53 2011 -0400
+++ b/vim/.vimrc	Thu Apr 07 14:32:33 2011 -0400
@@ -130,6 +130,10 @@
 " L is easier to type, and I never use the default behavior.
 noremap L $
 
+" Heresy
+inoremap <c-a> <esc>I
+inoremap <c-e> <esc>A
+
 " Open a Quickfix window for the last search
 nnoremap <silent> <leader>/ :execute 'vimgrep /'.@/.'/g %'<CR>:copen<CR>
 
@@ -269,8 +273,8 @@
 "     <p>
 "         |
 "     </p>
-au BufNewFile,BufRead *.html imap <buffer> <c-e><cr> <c-e><s-cr>
-au BufNewFile,BufRead *.html imap <buffer> <c-e><space> <c-e>.<bs>
+au BufNewFile,BufRead *.html imap <buffer> <c-s><cr> <c-s><s-cr>
+au BufNewFile,BufRead *.html imap <buffer> <c-s><space> <c-s>.<bs>
 
 " Django tags
 au FileType jinja,htmldjango inoremap <buffer> <c-t> {%<space><space>%}<left><left><left>
@@ -523,6 +527,13 @@
 vnoremap <silent> <Leader>F :<C-U>call EasyMotionF(1, 1)<CR>
 
 " }}}
+" Sparkup {{{
+
+let g:sparkupExecuteMapping = '<c-s>'
+let g:sparkupNextMapping = '<c-q>'
+
+"}}}
+
 
 " }}}
 " Synstack -------------------------------------------------------------------- {{{
@@ -537,7 +548,7 @@
   echo map(synstack(line('.'), col('.')), 'synIDattr(v:val, "name")')
 endfunc " }}}
 
-nmap <C-S> :call SynStack()<CR>
+nmap <M-S> :call SynStack()<CR>
 
 " }}}
 " Text objects ---------------------------------------------------------------- {{{
@@ -677,10 +688,6 @@
         map <leader><leader> <Plug>PeepOpen
     end
 
-    " Only map Sparkup to ⌘+e when running in MacVim.
-    let g:sparkupExecuteMapping = '<c-e>'
-    let g:sparkupNextMapping = '<c-q>'
-
     highlight SpellBad term=underline gui=undercurl guisp=Orange
 
     " Use a line-drawing char for pretty vertical splits.