From 28abafcf9db66f3c9932be4de201595d04dd89eb Mon Sep 17 00:00:00 2001
From: David Majnemer <dmajnemer@localroast.home>
Date: Tue, 23 Dec 2008 21:38:35 -0500
Subject: [PATCH 1/6] added a file to automatically set up git for macs

---
 zsh/git | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100755 zsh/git

diff --git a/zsh/git b/zsh/git
new file mode 100755
index 0000000..0369202
--- /dev/null
+++ b/zsh/git
@@ -0,0 +1,19 @@
+if [[ -d /usr/local/git/man ]] ; then
+	if [[ -z "${MANPATH}" ]] ; then
+		export MANPATH="/usr/local/git/man":$(manpath)
+	else
+		export MANPATH="/usr/local/git/man:${MANPATH}"
+	fi
+fi
+
+if [[ -d /usr/local/git/bin ]] ; then
+	if [[ -z "${PATH}" ]] ; then
+		export PATH="/usr/local/git/bin"
+	else
+		export PATH="/usr/local/git/bin:${PATH}"
+	fi
+fi
+
+if [[ -d /usr/local/git/libexec/git-core ]] ; then
+	export PATH="/usr/local/git/libexec/git-core:${PATH}"
+fi

From 1382c16893dd27965571819624b11bd4cb59e602 Mon Sep 17 00:00:00 2001
From: David Majnemer <dmajnemer@localroast.home>
Date: Wed, 24 Dec 2008 23:48:42 -0500
Subject: [PATCH 2/6] fix screen on terminals with 256 color when the screen is
 not compiled with 256 color support

---
 screenrc | 3 ---
 zshrc    | 5 ++---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/screenrc b/screenrc
index 7fb3896..0104fbe 100644
--- a/screenrc
+++ b/screenrc
@@ -19,9 +19,6 @@ nethack on
 # mess with bold
 attrcolor b ".I"
 
-# get screen to go for 256 colors
-termcapinfo xterm-256color 'Co#256'
-
 # erase background with current bg color
 defbce on
 
diff --git a/zshrc b/zshrc
index c35bdd0..231b4dd 100644
--- a/zshrc
+++ b/zshrc
@@ -101,7 +101,6 @@ function fix_terminfo_db
 {
 	if [[ `which infocmp` = "$1/bin/infocmp" ]] ; then
 		export TERMINFO="$1/share/terminfo"
-		export TERM=$TERM
 	fi
 }
 
@@ -155,7 +154,7 @@ esac
 
 export TERM=$(fix_term $TERM)
 
-if [[ $TERM == *256* ]] ; then
+if [[ $TERM == *256* ]] && (infocmp screen-256color-bce &> /dev/null)  ; then
 	export SCREEN_COLOR="-256color"
 fi
 
@@ -213,7 +212,7 @@ case $TERM in
 		bindkey '\e[1;5D' emacs-backward-word
 		bindkey '\e[3~' delete-char
 	;;
-	linux)
+	linux|vt100)
 		bindkey '\e[1~' beginning-of-line
 		bindkey '\e[4~' end-of-line
 		bindkey '\e[3~' delete-char

From 1ae2914fc1a068d11999cff0e3fa7428564f34eb Mon Sep 17 00:00:00 2001
From: David Majnemer <dmajnemer@localroast.home>
Date: Thu, 25 Dec 2008 17:11:49 -0500
Subject: [PATCH 3/6] add the "up" alias to git a la svn

---
 gitconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gitconfig b/gitconfig
index 7a79ce8..3360fc9 100644
--- a/gitconfig
+++ b/gitconfig
@@ -3,6 +3,7 @@
 	ci = commit
 	st = status
 	di = diff --color-words
+	up = pull
 [color]
 	diff = auto
 	status = auto

From 49e513237f22eeeeb8ec28b8060ab4b7efafcc7b Mon Sep 17 00:00:00 2001
From: David Majnemer <dmajnemer@localroast.home>
Date: Thu, 25 Dec 2008 17:12:45 -0500
Subject: [PATCH 4/6] add support for MacPorts

---
 zsh/ports | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100755 zsh/ports

diff --git a/zsh/ports b/zsh/ports
new file mode 100755
index 0000000..f73190b
--- /dev/null
+++ b/zsh/ports
@@ -0,0 +1,23 @@
+if [[ -d /opt/local/man ]] ; then
+	if [[ -z "${MANPATH}" ]] ; then
+		export MANPATH="/opt/local/man":$(manpath)
+	else
+		export MANPATH="/opt/local/man:${MANPATH}"
+	fi
+fi
+
+if [[ -d /opt/local/bin ]] ; then
+	if [[ -z "${PATH}" ]] ; then
+		export PATH="/opt/local/bin"
+	else
+		export PATH="/opt/local/bin:${PATH}"
+	fi
+fi
+
+if [[ -d /opt/local/sbin ]] ; then
+	export PATH="/opt/local/sbin:${PATH}"
+fi
+
+if [[ -d /opt/local/libexec ]] ; then
+	export PATH="/opt/local/libexec:${PATH}"
+fi

From a0976591717495058af1ae0d7d33fdb4adc81017 Mon Sep 17 00:00:00 2001
From: David Majnemer <dmajnemer@localroast.home>
Date: Thu, 25 Dec 2008 21:38:48 -0500
Subject: [PATCH 5/6] make search in less case insensitive

---
 zshrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zshrc b/zshrc
index 231b4dd..87f9655 100644
--- a/zshrc
+++ b/zshrc
@@ -105,7 +105,7 @@ function fix_terminfo_db
 }
 
 ( which lesspipe &> /dev/null ) && eval $(lesspipe)
-export LESS=' -R'
+export LESS='-iR'
 
 ( which less &> /dev/null ) && export PAGER='less'
 

From 21ffac1e4434156413641b228abf631bc5c906b1 Mon Sep 17 00:00:00 2001
From: David Majnemer <dmajnemer@localroast.home>
Date: Thu, 25 Dec 2008 22:46:39 -0500
Subject: [PATCH 6/6] change vimrc so that rxvt-unicode always gets utf-8

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

diff --git a/vimrc b/vimrc
index dad794a..06fdecd 100644
--- a/vimrc
+++ b/vimrc
@@ -7,10 +7,8 @@ if has ('multi_byte')      " Make sure we have unicode support
    scriptencoding utf-8    " This file is in UTF-8
 
    " ---- Terminal Setup ----
-   if (&termencoding == "")
-      if (&term =~ "xterm") || (&term =~ "rxvt-unicode")
-         set termencoding=utf-8
-      endif
+   if (&termencoding == "" && &term =~ "xterm") || (&term =~ "rxvt-unicode")
+      set termencoding=utf-8
    endif
    set encoding=utf-8      " Default encoding should always be UTF-8
 endif