Merge remote-tracking branch 'remotes/origin/master' into homedir

.gvimrc

@@ -3,9 +3,11 @@ winsize 115 45
 "set guifont=DejaVu\ Sans\ Mono:h15.00
 set guifont=Inconsolata\ 14
 set guioptions-=L
+set guioptions-=r
 
 if has("gui_macvim")
   set fuoptions=maxvert,maxhorz
+  set guifont=Inconsolata:h18
 endif
 "call AppleTSetPath("~/work/client")
 "map gg :CmdT 

.vimrc

@@ -313,6 +313,7 @@ endfunction
 command! -complete=shellcmd -nargs=+ Shell call s:ExecuteInShellOutput(<q-args>)
 command! -complete=shellcmd -nargs=+ Exec call s:ExecuteInShell(<q-args>)
 command! -nargs=* Make call s:ExecuteInShellOutput('make '.<q-args>)
+command! -nargs=* Git call s:ExecuteInShellOutput('git '.<q-args>)
 command! -nargs=* PTW call s:ExecuteInShell('ptw post --client=vim "'.<q-args>.'"')
 
 " Highlight all instances of word under cursor, when idle.

.zprofile

@@ -36,4 +36,4 @@ ENV=$HOME/.zshrc; export ENV
 
 #alias ls='ls -FG'
 #alias la='ls -FGal'
-#source ~/.bashrc
+#source ~/.zshrc

.zshenv

@@ -9,3 +9,18 @@ bindkey '\e[3~' forward-delete-char # Delete key
 bindkey '\e[6~' end-of-history # Page down key
 bindkey '\e[2~' redisplay # Insert key
 bindkey '\e[5~' insert-last-word # Page up key
+
+# remove /usr/games and /usr/X11R6/bin if you want
+PATH=$HOME/bin:/bin:/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/usr/games:/usr/X11R6/bin:/$HOME/.gem/ruby/1.9/bin; export PATH
+case `uname` in
+SunOS)
+	UCB_PATH=/usr/sww/lang/acl:/usr/sww/lang/jdk-1.5.0/bin:/usr/openwin/bin:/usr/dt/bin:/usr/sww/opt/java/bin:/usr/sww/bin:/share/b/grading/bin:/share/b/grading/sbin:/share/b/runas/sun4u:/share/b/bin:/home/aa/projects/scheme/bin:/usr/ucb:/usr/ccs/bin:/usr/sfw/bin; export UCB_PATH
+	PATH=$PATH:$UCB_PATH; export PATH
+	;;
+Darwin)
+	MACPORTS_PATH=/opt/local/bin:/opt/local/sbin:/opt/local/usr/bin:/opt/local/usr/local/bin; export MACPORTS_PATH
+	PATH=$HOME/bin:$MACPORTS_PATH:$PATH; export PATH
+	export DISPLAY=:0.0
+	#set completion-ignore-case on
+	;;
+esac

.zshrc

@@ -1,4 +1,20 @@
 #complist
+# If not running interactively, don't do anything
+[ -z "$PS1" ] && return
+
+# don't put duplicate lines in the history. See bash(1) for more options
+export HISTCONTROL=ignoredups
+
+# make less more friendly for non-text input files, see lesspipe(1)
+[ -x /usr/bin/lesspipe ] && eval "$(lesspipe)"
+
+# set variable identifying the chroot you work in (used in the prompt below)
+if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then
+    debian_chroot=$(cat /etc/debian_chroot)
+fi
+
+
+PERL5LIB=$HOME/local/lib64/perl5/site_perl/5.8.8/
 autoload -U compinit
 compinit
 setopt extended_glob
@@ -62,7 +78,9 @@ fi
 
 #source ~/.zsh_profile
 source ~/.zprofile
-source ~/.bash_aliases
+if [ -f ~/.bash_aliases ]; then
+    source ~/.bash_aliases
+fi
 source ~/.zshenv
 
 ##############################################################