Merge branch 'master' of ssh://git.madduck.net/madduck/pub/etc/zsh

[etc/zsh.git] / .zsh / zshrc / 80_prompt

diff --git a/.zsh/zshrc/80_prompt b/.zsh/zshrc/80_prompt
index d42b76c114037bd47853c5acb1c295d201e26003..5ddbe823dfe7f8c14625ffae85f17cf54e30f6a6 100644 (file)
--- a/.zsh/zshrc/80_prompt
+++ b/.zsh/zshrc/80_prompt
@@ -5,24 +5,20 @@
 # Copyright © 1994–2008 martin f. krafft <madduck@madduck.net>
 # Released under the terms of the Artistic Licence 2.0
 #
 # Copyright © 1994–2008 martin f. krafft <madduck@madduck.net>
 # Released under the terms of the Artistic Licence 2.0
 #

-# Source repository: http://git.madduck.net/v/etc/zsh.git
+# Source repository: git://git.madduck.net/etc/zsh.git

 #
 
 if [ "${PS1:-}" = '%m%# ' ]; then
 #
 
 if [ "${PS1:-}" = '%m%# ' ]; then

-  _MIDDLE="%1v%(2v.|%B%2v%b|.)%(3v.%3v.)"
+  local _MIDDLE="%1v%(2v.|%B%2v%b|.)%(3v.%3v.)"

   if is_root; then
   if is_root; then

-    _MIDDLE="%25<..<%~%<<"
-    _PS1_HL=U
+    _MIDDLE="%25<…<%~%<<"
+    local _PS1_HL=U

   fi
 
   fi
 

-  _MACHINE_NAME="${_PS1_HL:=B}%m%${(L)_PS1_HL}"
-  _MACHINE_NAME="$_MACHINE_NAME${debian_chroot:+/$debian_chroot}"
+  local _MACHINE_NAME="${_PS1_HL:=B}%m%${(L)_PS1_HL}"
+  _MACHINE_NAME="$_MACHINE_NAME${debian_chroot:+/%S$debian_chroot%s}"

 
   PS1="%(2L.+.)%${_MACHINE_NAME}:${_MIDDLE}%# "
 
   PS1="%(2L.+.)%${_MACHINE_NAME}:${_MIDDLE}%# "

-
-  unset _MACHINE_NAME
-  unset _PS1_HL
-  unset _MIDDLE

 fi
 
 : ${RPS1:="#%(0?..%?,)%!"}
 fi
 
 : ${RPS1:="#%(0?..%?,)%!"}