Merge branch 'master' of gitosis@majnematic.com:davesdots

bash/alias

@@ -0,0 +1,2 @@
+alias :q='exit'
+alias :wq='exit'

commonsh/10_alias

@@ -20,8 +20,6 @@ export FCEDIT
 
 # aliases
 alias cd..='cd ..'
-alias :q='exit'
-alias :wq='exit'
 
 # handles per OS aliases, fixes a few terms
 case `uname -s` in

zsh/alias

@@ -2,3 +2,5 @@ alias cp='nocorrect cp'
 alias mv='nocorrect mv'
 alias rm='nocorrect rm -ir'
 alias mkdir='nocorrect mkdir'
+alias :q='exit'
+alias :wq='exit'

zsh/bindkey

@@ -7,7 +7,7 @@ bindkey ' ' magic-space
 bindkey -M emacs '\ee' edit-command-line
 
 case $TERM in
-	screen|xterm*|putty)
+	screen|xterm*|putty*)
 		bindkey '\e[H' beginning-of-line
 		bindkey '\e[F' end-of-line
 		bindkey '\eOH' beginning-of-line

zshrc

@@ -3,10 +3,10 @@
 # Trivial modifications: David Majnemer
 # vim:set nowrap:
 
-autoload -U compinit; compinit -d "${HOME}/.zsh/.zcompdump"
+autoload compinit; compinit -d "${HOME}/.zsh/.zcompdump"
 
-autoload -U age
-autoload -U zmv
+autoload age
+autoload zmv
 
 if [ ${ZSH_VERSION//.} -gt 420 ] ; then
 	autoload -U url-quote-magic