# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1289606934 18000
# Node ID 6bc9af6eebce8a78de761d0d45d8acd12d122a16
# Parent  d426a1494ef9e570b4d0726c4e7beb67018248a9# Parent  c4d3b450770725679dc2f8f1118562248b4c27eb
Merge.

diff -r c4d3b4507707 -r 6bc9af6eebce vim/.vimrc
--- a/vim/.vimrc	Fri Nov 12 18:30:35 2010 -0500
+++ b/vim/.vimrc	Fri Nov 12 19:08:54 2010 -0500
@@ -125,6 +125,9 @@
 nnoremap <F1> :set invfullscreen<CR>
 vnoremap <F1> :set invfullscreen<CR>
 
+" Fuck you too, manual key
+nnoremap K <nop>
+
 " Various syntax stuff
 au BufNewFile,BufRead *.less set filetype=less
 au BufRead,BufNewFile *.scss set filetype=scss
diff -r c4d3b4507707 -r 6bc9af6eebce vim/snippets/lisp.snippets
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vim/snippets/lisp.snippets	Fri Nov 12 19:08:54 2010 -0500
@@ -0,0 +1,33 @@
+snippet defp
+	(defparameter ${1:name} ${2:value})${3}
+snippet defv
+	(defvar ${1:name} ${2:value})${3}
+snippet defun
+	(defun ${1:name} (${2:arguments})
+	  ${3:body})
+snippet let
+	(let ((${1:name} ${2:value})${3: others})
+	  ${4:body})
+snippet flet
+	(flet ((${1:name} (${2:arguments})
+	         ${3:body})${4: others})
+	  ${5:body})
+snippet labels
+	(labels ((${1:name} (${2:arguments})
+	           ${3:body})${4: others})
+	  ${5:body})
+snippet when
+	(when ${1:condition}
+	      ${2:body})
+snippet unless
+	(unless ${1:condition}
+	        ${2:body})
+snippet cond
+	(cond (${1:condition} ${2:body})
+		  ${3:others})
+snippet case
+	(case ${1:item}
+		 (${2:option} ${3:body})
+		 ${4:others})
+snippet mem
+	(member ${1:item} ${2:list})