# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1285087992 14400
# Node ID 2e52cefc189933cf2d3168527ffee13b1925be94
# Parent  da7bdcfffdcbb4d499b0e53b922d437a3aeb982e# Parent  9841a762fa2d8e006c69de101d7df6a15cfab9a2
Merge.

diff -r 9841a762fa2d -r 2e52cefc1899 .hgignore
--- a/.hgignore	Tue Sep 21 12:51:12 2010 -0400
+++ b/.hgignore	Tue Sep 21 12:53:12 2010 -0400
@@ -8,3 +8,4 @@
 tags
 config/bcvi
 *.un~
+vim/tmp
diff -r 9841a762fa2d -r 2e52cefc1899 vim/.gvimrc
--- a/vim/.gvimrc	Tue Sep 21 12:51:12 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-set guifont=Menlo:h12
-colorscheme molokai
-set background=dark
-
-set go-=T
-set go-=l
-set go-=L
-set go-=r
-set go-=R
-
-if has("gui_macvim")
-    macmenu &File.New\ Tab key=<nop>
-    map <leader>t <Plug>PeepOpen
-end
-
-let g:sparkupExecuteMapping = '<D-e>'
-
-highlight SpellBad term=underline gui=undercurl guisp=Orange
-
diff -r 9841a762fa2d -r 2e52cefc1899 vim/.vimrc
--- a/vim/.vimrc	Tue Sep 21 12:51:12 2010 -0400
+++ b/vim/.vimrc	Tue Sep 21 12:53:12 2010 -0400
@@ -32,9 +32,9 @@
 set undofile
 
 " Backups
-set backupdir=~/tmp,/tmp " backups (~)
-set directory=~/tmp,/tmp " swap files
-set backup               " enable backups
+set backupdir=~/.vim/tmp/backup// " backups
+set directory=~/.vim/tmp/swap//   " swap files
+set backup                        " enable backups
 
 " Leader
 let mapleader = ","
@@ -48,7 +48,7 @@
 set showmatch
 set hlsearch
 set gdefault
-map <leader><space> :let @/=''<cr>
+map <leader><space> :noh<cr>
 runtime macros/matchit.vim
 nmap <tab> %
 vmap <tab> %
@@ -113,6 +113,7 @@
 set foldtext=MyFoldText()
 
 " Fuck you, help key.
+set fuoptions=maxvert,maxhorz
 inoremap <F1> <ESC>:set invfullscreen<CR>a
 nnoremap <F1> :set invfullscreen<CR>
 vnoremap <F1> :set invfullscreen<CR>
@@ -127,7 +128,7 @@
 au BufNewFile,BufRead *.m*down nnoremap <leader>3 I### <ESC>
 
 " Sort CSS
-map <leader>S ?{<CR>jV/^\s*\}?$<CR>k:sort<CR>:let @/=''<CR>
+map <leader>S ?{<CR>jV/^\s*\}?$<CR>k:sort<CR>:noh<CR>
 
 " Clean whitespace
 map <leader>W :%s/\s\+$//<cr>:let @/=''<CR>
@@ -228,3 +229,26 @@
 " Save when losing focus
 au FocusLost * :wa
 
+" Stop it, hash key
+inoremap # X<BS>#
+
+if has('gui_running')
+    set guifont=Menlo:h12
+    colorscheme molokai
+    set background=dark
+
+    set go-=T
+    set go-=l
+    set go-=L
+    set go-=r
+    set go-=R
+
+    if has("gui_macvim")
+        macmenu &File.New\ Tab key=<nop>
+        map <leader>t <Plug>PeepOpen
+    end
+
+    let g:sparkupExecuteMapping = '<D-e>'
+
+    highlight SpellBad term=underline gui=undercurl guisp=Orange
+endif
diff -r 9841a762fa2d -r 2e52cefc1899 vim/bundle/makegreen/plugin/makegreen.vim
--- a/vim/bundle/makegreen/plugin/makegreen.vim	Tue Sep 21 12:51:12 2010 -0400
+++ b/vim/bundle/makegreen/plugin/makegreen.vim	Tue Sep 21 12:53:12 2010 -0400
@@ -70,7 +70,7 @@
 noremap <SID>Make :call <SID>RunMake()<CR>
 
 if !hasmapto('<Plug>MakeGreen')
-  map <unique> <silent> <Leader>t <Plug>MakeGreen
+  map <unique> <silent> <Leader>test <Plug>MakeGreen
 endif
 " }}}1
 
diff -r 9841a762fa2d -r 2e52cefc1899 vim/tmp/backup/.placeholder
diff -r 9841a762fa2d -r 2e52cefc1899 vim/tmp/swap/.placeholder