From: PHO <pho@cielonegro.org>
Date: Mon, 5 Jan 2009 08:42:23 +0000 (+0900)
Subject: hand merge to resolve _zshrc conflict
X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=898c1001bb9463ba26cbdcb32466b39660225027;hp=-c;p=sugar.git

hand merge to resolve _zshrc conflict
---

898c1001bb9463ba26cbdcb32466b39660225027
diff --combined dot-files/_zshrc
index 25a5ee6,dd762ec..fc238a3
--- a/dot-files/_zshrc
+++ b/dot-files/_zshrc
@@@ -22,9 -22,6 +22,9 @@@ if [ -f "$HOME/.ssh/known_hosts" ]; the
      _cache_hosts=(`perl -ne  'if (/^([a-zA-Z0-9.-]+)/) { print "$1\n";}' ~/.ssh/known_hosts`)
  fi
  
 +autoload -U colors
 +colors
 +
  setopt no_beep
  setopt auto_cd
  setopt auto_list
@@@ -52,9 -49,12 +52,19 @@@ setopt hist_ignore_spac
  setopt inc_append_history
  setopt share_history
  
- PROMPT=$'%{\ek\e\\%}%{%(?.$fg[green].$fg[red])%}%B[%n@%m] %#%b %{$reset_color%}'
+ function _we_are_in_gnu_screen () {
+     [ "$WINDOW" != "" ]
+ }
+ 
 -PROMPT=$'%{\ek\e\\%}%B[%n@%m] %#%b '
 -RPROMPT='%U%?%u %U%D{%m/%d}%u %U%D{%T}%u %U%~%u'
++_prompt_base='%{%(?.$fg[green].$fg[red])%}%B[%n@%m] %#%b %{$reset_color%}'
++if ( _we_are_in_gnu_screen ); then
++    PROMPT=$'%{\ek\e\\%}'$_prompt_base
++else
++    PROMPT=$_prompt_base
++fi
++
 +RPROMPT='%U%D{%m/%d}%u %U%D{%T}%u %U%~%u'
 +
  HISTFILE="$HOME/.zhistory"
  HISTSIZE=6000000
  SAVEHIST=6000000
@@@ -66,10 -66,10 +76,10 @@@ alias -g T="| tail
  
  alias ..='cd ..'
  alias cd..='cd ..'
 -alias ls='ls -wF'
 -alias la='ls -wa'
 -alias l='ls -wl'
 -alias lls='ls -wla'
 +alias ls='ls -F'
 +alias la='ls -a'
 +alias l='ls -l'
 +alias lls='ls -la'
  alias p='pushd'
  alias o='popd'
  alias d='dirs'