Added completion config

[user/henk/vcsh/zsh.git] / .zsh_functions

diff --git a/.zsh_functions b/.zsh_functions
index d4818ec5017b3f5ac6b38496cfc84ead13d09baf..abda777147f44189446655f167e2cb3e87bf739c 100644 (file)
--- a/.zsh_functions
+++ b/.zsh_functions
@@ -17,27 +17,35 @@ function ESC_print () {
 }
 
 preexec () {
-  if [[ "$TERM" == screen* ]] ; then
-      local CMD=${1[(wr)^(*=*|sudo|ssh|evince|-*)]}
-      ESC_print ${CMD}
-  fi
-  case $TERM in
-      (xterm*|rxvt*)
-          set_title "${(%):-"%n@%m:"}" "$1"
-          ;;
-  esac
+    case $TERM in
+        (xterm*|rxvt*)
+            set_title "${(%):-"%n@%m:"}" "$1"
+        ;;
+        (screen*)
+            local CMD=${1[(wr)^(*=*|sudo|ssh|evince|-*)]}
+            ESC_print ${CMD}
+        ;;
+    esac
 }
 
 precmd () {
-  if [[ $TERM == screen* ]] ; then
-    ESC_print "zsh"
-  fi
-
-  case $TERM in
-    (xterm*|rxvt*)
-      set_title ${(%):-"%n@%m: %~"}
-      ;;
-  esac
+    case $TERM in
+        (xterm*|rxvt*)
+            set_title ${(%):-"%n@%m: %~"}
+        ;;
+        (screen*)
+            ESC_print "zsh"
+        ;;
+    esac
+
+    vcs_info
+    if [[ -n ${vcs_info_msg_0_} ]]; then
+        local HENKSPROMPT="%(0?..%F{red}E%?%f )%(1j.%F{yellow}J%j%f .)%(3L.%F{yellow}L%L%f .)%3~ %F{green}$VCSH_REPO_NAME%f%F{yellow}${vcs_info_msg_0_}%f%# "
+        PS1="$HENKSPROMPTHEADER$HENKSPROMPT"
+    else
+        local HENKSPROMPT="%(0?..%F{red}E%?%f )%(1j.%F{yellow}J%j%f .)%(3L.%F{yellow}L%L%f .)%3~ %F{green}$VCSH_REPO_NAME%f%# "
+        PS1="$HENKSPROMPTHEADER$HENKSPROMPT"
+    fi
 }
 
 function vifind () {