Merge branch 'master' of git+ssh://github.com/adefaria/clearscm

[clearscm.git] / rc / functions

diff --git a/rc/functions b/rc/functions
index 1f8dcdc..28135c7 100644 (file)
--- a/rc/functions
+++ b/rc/functions
@@ -119,6 +119,7 @@ function set_prompt {
          "$TERM" = "2392A"          -o \
          "$TERM" = "dtterm"         -o \
          "$TERM" = "vt100"          -o \
+         "$TERM" = "cygwin"         -o \
          "$TERM" = "xterm"          -o \
          "$TERM" = "xtermc"         -o \
          "$TERM" = "xterm-256color" -o \
@@ -132,6 +133,7 @@ function set_prompt {
   fi
 
   if [ "$TERM" = "vt100"          -o \
+       "$TERM" = "cygwin"         -o \
        "$TERM" = "xterm"          -o \
        "$TERM" = "xtermc"         -o \
        "$TERM" = "xterm-256color" -o \
@@ -224,7 +226,7 @@ function sj {
     ps $psopts | $PAGER
   else
     for str; do
-      ps $psopts | grep "$str" | grep -v "grep $str" | grep -v "grep -d skip"
+      ps $psopts | grep "$str" | grep -ve "grep $str" -e "grep -d skip" -e "grep --color=auto"
     done
   fi
 } # sj