# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1289828432 18000
# Node ID 662f1676bfb4ad005ecfcc7cf2b43e8477d8d683
# Parent  18dc23b28776083c868ae7aa55326740f1fbb23e
vim: more

diff -r 18dc23b28776 -r 662f1676bfb4 vim/.vimrc
--- a/vim/.vimrc	Fri Nov 12 19:13:56 2010 -0500
+++ b/vim/.vimrc	Mon Nov 15 08:40:32 2010 -0500
@@ -318,6 +318,9 @@
 onoremap <silent> in" :<C-U>normal! f"vi"<cr>
 onoremap <silent> an" :<C-U>normal! f"va"<cr>
 
+" Skipreturn
+inoremap <c-cr> <esc>A<cr>
+
 " VimClojure
 let vimclojure#HighlightBuiltins=1
 let vimclojure#ParenRainbow=1
@@ -336,6 +339,7 @@
     if has("gui_macvim")
         macmenu &File.New\ Tab key=<nop>
         map <leader>t <Plug>PeepOpen
+        map <D-t> <Plug>PeepOpen
     end
 
     let g:sparkupExecuteMapping = '<D-e>'
diff -r 18dc23b28776 -r 662f1676bfb4 vim/colors/molokai.vim
--- a/vim/colors/molokai.vim	Fri Nov 12 19:13:56 2010 -0500
+++ b/vim/colors/molokai.vim	Mon Nov 15 08:40:32 2010 -0500
@@ -58,7 +58,7 @@
 hi Macro           guifg=#C4BE89               gui=italic
 hi SpecialKey      guifg=#66D9EF               gui=italic
 
-hi MatchParen      guifg=#CD5907 guibg=#232728   gui=bold
+hi MatchParen      guifg=#E4E400 guibg=bg      gui=bold
 hi ModeMsg         guifg=#E6DB74
 hi MoreMsg         guifg=#E6DB74
 hi Operator        guifg=#F92672
diff -r 18dc23b28776 -r 662f1676bfb4 vim/snippets/lisp.snippets
--- a/vim/snippets/lisp.snippets	Fri Nov 12 19:13:56 2010 -0500
+++ b/vim/snippets/lisp.snippets	Mon Nov 15 08:40:32 2010 -0500
@@ -1,33 +1,34 @@
 snippet defp
-	(defparameter ${1:name} ${2:value})${3}
+	(defparameter ${1} ${2})${3}
 snippet defv
-	(defvar ${1:name} ${2:value})${3}
+	(defvar ${1} ${2})${3}
 snippet defun
-	(defun ${1:name} (${2:arguments})
-	  ${3:body})
+	(defun ${1} (${2})
+	  ${3})
+snippet defm
+	(defmethod ${1} (${2})
+	  ${3})
 snippet let
-	(let ((${1:name} ${2:value})${3: others})
-	  ${4:body})
+	(let ((${1} ${2})${3})
+	  ${4})
 snippet flet
-	(flet ((${1:name} (${2:arguments})
-	         ${3:body})${4: others})
-	  ${5:body})
+	(flet ((${1} (${2})
+	         ${3})${4})
+	  ${5})
 snippet labels
-	(labels ((${1:name} (${2:arguments})
-	           ${3:body})${4: others})
-	  ${5:body})
+	(labels ((${1} (${2})
+	           ${3})${4})
+	  ${5})
 snippet when
-	(when ${1:condition}
-	      ${2:body})
+	(when ${1}
+	      ${2})
 snippet unless
-	(unless ${1:condition}
-	        ${2:body})
+	(unless ${1}
+	        ${2})
 snippet cond
-	(cond (${1:condition} ${2:body})
-		  ${3:others})
+	(cond (${1} ${2})
+		  ${3})
 snippet case
-	(case ${1:item}
-		 (${2:option} ${3:body})
-		 ${4:others})
-snippet mem
-	(member ${1:item} ${2:list})
+	(case ${1}
+		 (${2} ${3})
+		 ${4})