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

gitconfig

@@ -3,6 +3,7 @@
 	ci = commit
 	st = status
 	di = diff --color-words
+	up = pull
 [color]
 	diff = auto
 	status = auto

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
 

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

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

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

zshrc

@@ -101,12 +101,11 @@ function fix_terminfo_db
 {
 	if [[ `which infocmp` = "$1/bin/infocmp" ]] ; then
 		export TERMINFO="$1/share/terminfo"
-		export TERM=$TERM
 	fi
 }
 
 ( which lesspipe &> /dev/null ) && eval $(lesspipe)
-export LESS=' -R'
+export LESS='-iR'
 
 ( which less &> /dev/null ) && export PAGER='less'
 
@@ -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