allow %# to be replaced with psvar[4] if set

[etc/zsh.git] / .zsh / themes / prompt_madduck_setup

diff --git a/.zsh/themes/prompt_madduck_setup b/.zsh/themes/prompt_madduck_setup
index 0b6dddcbdadcc073c2d000639617056c6b86ee6b..c9a04bc251f3cc3ec0316efe51178adccceb57d1 100644 (file)
--- a/.zsh/themes/prompt_madduck_setup
+++ b/.zsh/themes/prompt_madduck_setup
@@ -59,7 +59,7 @@ __git_print_preprompt()
   function output() {
     emulate -L zsh
     local title="$@"
   function output() {
     emulate -L zsh
     local title="$@"

-    local output=(${(f)"$(cat)"})
+    local output; output=(${(f)"$(cat)"})

 
     [[ ${#output} -ge 1 ]] || return
 
 
     [[ ${#output} -ge 1 ]] || return
 


@@ -81,8 +81,8 @@ __git_print_preprompt()
     eval git diff $common_options "$@" 2>/dev/null
   }
 
     eval git diff $common_options "$@" 2>/dev/null
   }
 

-  local cached=(${(f)"$(gitdiffstat --cached | output cached)"})
-  local changed=(${(f)"$(gitdiffstat | output changed)"})
+  local cached; cached=(${(f)"$(gitdiffstat --cached | output cached)"})
+  local changed; changed=(${(f)"$(gitdiffstat | output changed)"})

 
   local max=${#changed}
   [[ $max -lt ${#cached} ]] && max=${#cached}
 
   local max=${#changed}
   [[ $max -lt ${#cached} ]] && max=${#cached}


@@ -141,6 +141,11 @@ __vcs_get_repo_type()
 {
   emulate -L zsh
   # return the type of the closest repository in the path hierarchy
 {
   emulate -L zsh
   # return the type of the closest repository in the path hierarchy

+  # unless we're on a network filesystem:
+  if __on_networkfs; then
+    echo netfs
+    return
+  fi

   local dir
   while true; do
     [ -d ${dir}.git ] && echo git && break
   local dir
   while true; do
     [ -d ${dir}.git ] && echo git && break


@@ -259,7 +264,7 @@ __vcs_set_prompt_variables()
       ;;
     *)
       case "$repotype" in
       ;;
     *)
       case "$repotype" in

-        NONE) :;;
+        NONE|netfs) :;;

         *) warn "$repotype repositories not (yet) supported in the prompt";;
       esac
       local MAXLEN MINLEN
         *) warn "$repotype repositories not (yet) supported in the prompt";;
       esac
       local MAXLEN MINLEN


@@ -293,9 +298,11 @@ if ! is_root; then
 
   _update_vcs_prompt_vars_if_vcs_ran() {
     local vcs="$(__vcs_get_repo_type)"
 
   _update_vcs_prompt_vars_if_vcs_ran() {
     local vcs="$(__vcs_get_repo_type)"

-    case "$(history $(($HISTCMD - 1)))" in
+    case "$vcs/$(history $(($HISTCMD - 1)))" in

       # $vcs appeared in last command, so be sure to update
       # $vcs appeared in last command, so be sure to update

-      *${vcs}*) __vcs_set_prompt_variables "$vcs"
+      NONE/*) :;;
+      netfs/*) :;;
+      */*${vcs}*) __vcs_set_prompt_variables "$vcs"

     esac
   }
   add-zsh-hook precmd _update_vcs_prompt_vars_if_vcs_ran
     esac
   }
   add-zsh-hook precmd _update_vcs_prompt_vars_if_vcs_ran


@@ -331,10 +338,11 @@ function make_ps1() {
 
   # now comes the working directory, composed from parts in $psvar,
   # which is managed by $ZDOTDIR/zshrc/06-vcsprompt
 
   # now comes the working directory, composed from parts in $psvar,
   # which is managed by $ZDOTDIR/zshrc/06-vcsprompt

-  echo -n '%1v%(2v.|%B%2v%b|.)%(3v.%3v.)'
+  echo -n '%1v%(2V.|%B%2v%b|.)%(3V.%3v.)'

 
 

-  # and we finish with #/% for root/non-root, and a space
-  echo -n '%# '
+  # and we finish with #/% for root/non-root, unless psvar[4] is set, and
+  # a space
+  echo -n "%(4V.%4v.%#) "

   echo
 }
 PS1=$(make_ps1)
   echo
 }
 PS1=$(make_ps1)


@@ -363,7 +371,7 @@ function make_rps1() {
   echo -n '%D{%d %H:%M:%S.%.}'
   echo
 }
   echo -n '%D{%d %H:%M:%S.%.}'
   echo
 }

-RPS1=$(make_rps1)
+typeset -g RPS1="$(make_rps1)"

 unfunction make_rps1
 
 # vim:ft=zsh
 unfunction make_rps1
 
 # vim:ft=zsh