hand merge to resolve _zshrc conflict

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index 638e7b3ab5fb4e09947e76add110e275b7fa053a..c0d866e74d90be735710c927a09343a2f62ae1db 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -293,7 +293,7 @@
  '(cleite:auto-refresh-interval nil)
  '(cleite:measure-srpc-call-time t)
  '(cperl-merge-trailing-else nil)
- '(default-frame-alist (quote ((tool-bar-lines . 0) (menu-bar-lines . 1) (width . 80) (height . 25) (right-fringe) (left-fringe) (font . -adobe-courier-medium-r-normal--12-120-75-75-m-70-iso10646-1))))
+ '(default-frame-alist (quote ((tool-bar-lines . 0) (menu-bar-lines . 1) (width . 80) (height . 25) (right-fringe) (left-fringe))))
  '(ecb-add-path-for-not-matching-files (quote (t)))
  '(ecb-help-info-path "/sw/share/info/ecb.info")
  '(ecb-layout-name "left14")

diff --git a/dot-files/_zshenv b/dot-files/_zshenv
index 15c61d7166dd97543250903cb29282a32a5e6557..6f174bb8acde75f69d486f1665d3002ebf153390 100644 (file)
--- a/dot-files/_zshenv
+++ b/dot-files/_zshenv
@@ -65,6 +65,7 @@ export PAGER="less"
 export LV="-Ia -c"
 export LESS="--quit-if-one-screen -R"
 export GTK_IM_MODULE=uim
+export PERL_BADLANG=0
 
 # darcs
 export DARCS_EMAIL="pho@cielonegro.org"

diff --git a/dot-files/_zshrc b/dot-files/_zshrc
index 25a5ee636e85c39bbcc1afddc5ea483148b9f556..fc238a3f8a656a67b3c739a3ce1d4264855544fe 100644 (file)
--- a/dot-files/_zshrc
+++ b/dot-files/_zshrc
@@ -52,7 +52,17 @@ setopt hist_ignore_space
 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_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"