From 5529e93e98cc3dc9b8a7e187b861e503060d305f Mon Sep 17 00:00:00 2001
From: dave <dave@debian.localdomain>
Date: Mon, 6 Apr 2009 23:04:12 -0500
Subject: [PATCH 1/6] vim.tiny fix

---
 vimrc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/vimrc b/vimrc
index c83c625..75234fa 100644
--- a/vimrc
+++ b/vimrc
@@ -245,10 +245,12 @@ map Y y$
 vmap K k
 
 " :W and :Q are annoying
-command! -nargs=0 -bang Q q<bang>
-command! -nargs=0 -bang W w<bang>
-command! -nargs=0 -bang WQ wq<bang>
-command! -nargs=0 -bang Wq wq<bang>
+if has('user_commands')
+   command! -nargs=0 -bang Q q<bang>
+   command! -nargs=0 -bang W w<bang>
+   command! -nargs=0 -bang WQ wq<bang>
+   command! -nargs=0 -bang Wq wq<bang>
+endif
 
 " just continue
 nmap K K<cr>

From e8dc78751db2c146a46e766368fc6215f72ba61b Mon Sep 17 00:00:00 2001
From: David Alexander Majnemer <david@cthulhu.(none)>
Date: Mon, 6 Apr 2009 23:12:21 -0500
Subject: [PATCH 2/6] woah, bad idea reverted

---
 zsh/bindkey | 2 --
 1 file changed, 2 deletions(-)

diff --git a/zsh/bindkey b/zsh/bindkey
index d2933d9..7edaea5 100755
--- a/zsh/bindkey
+++ b/zsh/bindkey
@@ -41,8 +41,6 @@ case $TERM in
 		bindkey '\e[1~' beginning-of-line
 		bindkey '\e[4~' end-of-line
 		bindkey '\e[3~' delete-char
-		bindkey '\eOC' emacs-forward-word
-		bindkey '\eOD' emacs-backward-word
 	;;
 	*rxvt*|Eterm|aterm)
 		bindkey '\e[c' emacs-forward-word

From d2bbabfde9d74ba40d0639c3b1af7cdc3c11f772 Mon Sep 17 00:00:00 2001
From: David Alexander Majnemer <david@cthulhu.(none)>
Date: Mon, 6 Apr 2009 23:14:29 -0500
Subject: [PATCH 3/6] fixed

---
 commonsh/10_alias | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/commonsh/10_alias b/commonsh/10_alias
index 3035b4e..628dbd6 100755
--- a/commonsh/10_alias
+++ b/commonsh/10_alias
@@ -9,7 +9,7 @@ for dircolors in gdircolors dircolors ; do
 done
 
 # gimmie an editor, make it a nice vi clone
-for EDITOR in vim elvis vile nvi vi ; do
+for EDITOR in vimx vim elvis vile nvi vi ; do
 	( command -v $EDITOR >/dev/null 2>&1 ) && break
 done
 export EDITOR

From d98eb5bcb1ea2bc5a208db4f2c65c7157054dc33 Mon Sep 17 00:00:00 2001
From: dave <dave@debian.localdomain>
Date: Mon, 6 Apr 2009 23:57:53 -0500
Subject: [PATCH 4/6] vimx for those hat people

---
 commonsh/10_alias | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/commonsh/10_alias b/commonsh/10_alias
index 3035b4e..628dbd6 100755
--- a/commonsh/10_alias
+++ b/commonsh/10_alias
@@ -9,7 +9,7 @@ for dircolors in gdircolors dircolors ; do
 done
 
 # gimmie an editor, make it a nice vi clone
-for EDITOR in vim elvis vile nvi vi ; do
+for EDITOR in vimx vim elvis vile nvi vi ; do
 	( command -v $EDITOR >/dev/null 2>&1 ) && break
 done
 export EDITOR

From 6740a5d269180f2edd43179d81a1d78a9709fb9a Mon Sep 17 00:00:00 2001
From: dave <dave@debian.localdomain>
Date: Tue, 7 Apr 2009 00:02:04 -0500
Subject: [PATCH 5/6] vimx -> vim

---
 commonsh/10_alias | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/commonsh/10_alias b/commonsh/10_alias
index 628dbd6..a1e6d8e 100755
--- a/commonsh/10_alias
+++ b/commonsh/10_alias
@@ -18,6 +18,11 @@ export EDITOR
 FCEDIT=$EDITOR
 export FCEDIT
 
+# vimx -> vim
+if [ "${EDITOR}" = vimx ] ; then
+	alias vimx=vim
+fi
+
 # aliases
 alias cd..='cd ..'
 

From 154020d459bf186fd84c60a4e48493d440fc5769 Mon Sep 17 00:00:00 2001
From: dave <dave@debian.localdomain>
Date: Tue, 7 Apr 2009 00:04:21 -0500
Subject: [PATCH 6/6] whoops

---
 commonsh/10_alias | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/commonsh/10_alias b/commonsh/10_alias
index a1e6d8e..83bd181 100755
--- a/commonsh/10_alias
+++ b/commonsh/10_alias
@@ -20,7 +20,7 @@ export FCEDIT
 
 # vimx -> vim
 if [ "${EDITOR}" = vimx ] ; then
-	alias vimx=vim
+	alias vim=vimx
 fi
 
 # aliases