ignore failure when setopt histfcntllock, is-at-least did not work properly

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

diff --git a/.zsh/zshrc/80_xtermtitle b/.zsh/zshrc/80_xtermtitle
index e700aa1cf256e761407bbec065c749c5f3ffdf03..8059ca88c2041044dddaca526af19722ae4edd81 100644 (file)
--- a/.zsh/zshrc/80_xtermtitle
+++ b/.zsh/zshrc/80_xtermtitle
@@ -1,11 +1,11 @@
-# zterm-title
+# zshrc/80_xtermtitle

 #
 # Fancy setting of the xterm title
 #
 # Copyright © 1994–2008 martin f. krafft <madduck@madduck.net>
 # Released under the terms of the Artistic Licence 2.0
 #
 #
 # Fancy setting of the xterm title
 #
 # 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

 #
 # Based on http://www.zshwiki.org/cgi-bin/wiki.pl?ZshHardStatus
 #
 #
 # Based on http://www.zshwiki.org/cgi-bin/wiki.pl?ZshHardStatus
 #


@@ -27,11 +27,13 @@ __get_session_flags() {
   local flags; flags=
   [ -n "$DISPLAY" ] && flags="${flags}x"
   [ -n "$SSH_AUTH_SOCK" ] && flags="${flags}a"
   local flags; flags=
   [ -n "$DISPLAY" ] && flags="${flags}x"
   [ -n "$SSH_AUTH_SOCK" ] && flags="${flags}a"

+  [[ $SSH_CLIENT = *:* ]] && flags="${flags}6"

   [ -n "$flags" ] && echo "[${flags}]"
 }
 
 __get_standard_prompt() {
   [ -n "$flags" ] && echo "[${flags}]"
 }
 
 __get_standard_prompt() {

-  print -P "%m%#%25\<..\<%~ $(__get_session_flags)"
+  [[ -z $SSH_CLIENT ]] || print -nP "%m"
+  print -P "%#%25\<..\<%~ $(__get_session_flags)"

 }
 
 _set_plain_xterm_title() {
 }
 
 _set_plain_xterm_title() {