add lgrep function

[etc/zsh.git] / .zsh / zshrc / 60_vcsprompt

diff --git a/.zsh/zshrc/60_vcsprompt b/.zsh/zshrc/60_vcsprompt
index b5c15f1c36974a1b0c586c47358c90e82cc0379d..aeabd7744054d431ec6e7f93a2ce7009af9d3d3e 100644 (file)
--- a/.zsh/zshrc/60_vcsprompt
+++ b/.zsh/zshrc/60_vcsprompt
@@ -35,12 +35,12 @@ __git_get_branch()
 __git_print_preprompt()
 {
   local output
 __git_print_preprompt()
 {
   local output

-  output=(${(f):-"$(git diff --stat --relative)"})
+  output=(${(f):-"$(git diff --stat --relative 2>/dev/null)"})

   if [[ ${#output} -gt 1 ]]; then
     echo changes on filesystem:
     print "${(F)output[1,-2]}"
   fi
   if [[ ${#output} -gt 1 ]]; then
     echo changes on filesystem:
     print "${(F)output[1,-2]}"
   fi

-  output=(${(f):-"$(git diff --cached --stat --relative)"})
+  output=(${(f):-"$(git diff --cached --stat --relative 2>/dev/null)"})

   if [[ ${#output} -gt 1 ]]; then
     echo cached/staged changes:
     print "${(F)output[1,-2]}"
   if [[ ${#output} -gt 1 ]]; then
     echo cached/staged changes:
     print "${(F)output[1,-2]}"


@@ -100,7 +100,7 @@ __vcs_get_prompt_path_components()
 
   # shortcut: if there are no arguments, return a default prompt
   if [ -z "${1:-}" ]; then
 
   # shortcut: if there are no arguments, return a default prompt
   if [ -z "${1:-}" ]; then

-    pwdnamed="${(%):-%${_PROMPT_PATH_MAXLEN}<..<%~%<<}"
+    pwdnamed="${(%):-%${_PROMPT_PATH_MAXLEN}<…<%~%<<}"

     echo "$pwdnamed"
     return
   fi
     echo "$pwdnamed"
     return
   fi


@@ -138,7 +138,7 @@ __vcs_get_prompt_path_components()
   prelen=$((${_PROMPT_PATH_MAXLEN:-25} - $#branch - $#postfix))
   minlen=${_PROMPT_PATH_MINLEN:-10}
   (( $prelen < $minlen )) && prelen=$minlen
   prelen=$((${_PROMPT_PATH_MAXLEN:-25} - $#branch - $#postfix))
   minlen=${_PROMPT_PATH_MINLEN:-10}
   (( $prelen < $minlen )) && prelen=$minlen

-  prefix="${(%):-%${prelen}<..<%-${precomps}~%<<}"
+  prefix="${(%):-%${prelen}<…<%-${precomps}~%<<}"

 
   echo "'$prefix'" "'$branch'" "'$postfix'"
 }
 
   echo "'$prefix'" "'$branch'" "'$postfix'"
 }


@@ -182,7 +182,7 @@ __vcs_set_prompt_variables()
         NONE) :;;
         *) warn "$repotype repositories not (yet) supported in the prompt";;
       esac
         NONE) :;;
         *) warn "$repotype repositories not (yet) supported in the prompt";;
       esac

-      local p="%${MAXLEN}<..<%~%<<"
+      local p="%${MAXLEN}<…<%~%<<"

       #TODO find a better way so we don't have to nuke $psvar, but since the
       #     %(nv.true.false) check for prompts checks element count, not
       #     content, that's all we get for now
       #TODO find a better way so we don't have to nuke $psvar, but since the
       #     %(nv.true.false) check for prompts checks element count, not
       #     content, that's all we get for now