3 files changed, 25 insertions, 21 deletions
diff --git a/lib/git.zsh b/lib/git.zsh
index 748520a6f..118841f06 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -78,7 +78,7 @@ function git_prompt_long_sha() {
 git_prompt_status() {
   INDEX=$(command git status --porcelain -b 2> /dev/null)
   STATUS=""
-  if $(echo "$INDEX" | grep -E '^\?\? ' &> /dev/null); then
+  if $(echo "$INDEX" | command grep -E '^\?\? ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS"
   fi
   if $(echo "$INDEX" | grep '^A  ' &> /dev/null); then
diff --git a/lib/grep.zsh b/lib/grep.zsh
index 276fec382..348ebe623 100644
--- a/lib/grep.zsh
+++ b/lib/grep.zsh
@@ -1,24 +1,24 @@
-#
-# Color grep results
-# Examples: http://rubyurl.com/ZXv
-#
-
-GREP_OPTIONS="--color=auto"
-
-# avoid VCS folders (if the necessary grep flags are available)
+# is x grep argument available?
 grep-flag-available() {
     echo | grep $1 "" >/dev/null 2>&1
 }
+
+# color grep results
+GREP_OPTIONS="--color=auto"
+
+# ignore VCS folders (if the necessary grep flags are available)
+VCS_FOLDERS="{.bzr,.cvs,.git,.hg,.svn}"
+
 if grep-flag-available --exclude-dir=.cvs; then
-    for PATTERN in .cvs .git .hg .svn; do
-        GREP_OPTIONS+=" --exclude-dir=$PATTERN"
-    done
+    GREP_OPTIONS+=" --exclude-dir=$VCS_FOLDERS"
 elif grep-flag-available --exclude=.cvs; then
-    for PATTERN in .cvs .git .hg .svn; do
-        GREP_OPTIONS+=" --exclude=$PATTERN"
-    done
+    GREP_OPTIONS+=" --exclude=$VCS_FOLDERS"
 fi
-unfunction grep-flag-available
 
-export GREP_OPTIONS="$GREP_OPTIONS"
-export GREP_COLOR='1;32'
+# export grep settings
+alias grep="grep $GREP_OPTIONS"
+
+# clean up
+unset GREP_OPTIONS
+unset VCS_FOLDERS
+unfunction grep-flag-available
diff --git a/lib/history.zsh b/lib/history.zsh
index 1d83e56e3..179c22848 100644
--- a/lib/history.zsh
+++ b/lib/history.zsh
@@ -1,9 +1,13 @@
 ## Command history configuration
-if [ -z $HISTFILE ]; then
+if [ -z "$HISTFILE" ]; then
     HISTFILE=$HOME/.zsh_history
 fi
-HISTSIZE=10000
-SAVEHIST=10000
+if [ -z "$HISTSIZE" ]; then
+    HISTSIZE=10000
+fi
+if [ -z "$SAVEHIST" ]; then
+    SAVEHIST=10000
+fi
 
 setopt extended_history
 setopt hist_expire_dups_first