Auto commit by The Sugar System.

[sugar.git] / dot-files / _zshrc

diff --git a/dot-files/_zshrc b/dot-files/_zshrc
index eaf76574fb788c92b3d7c704bc9e078b9b424d96..487f03e3545dff02409ad18552810159d951e494 100644 (file)
--- a/dot-files/_zshrc
+++ b/dot-files/_zshrc
@@ -53,7 +53,7 @@ setopt inc_append_history
 setopt share_history
 
 function _we_are_in_gnu_screen () {
-    [ "$WINDOW" != "" ]
+    [[ "$WINDOW" != "" ]]
 }
 
 _prompt_base='%B[%n@%m] %{%(?.$fg[green].$fg[red])%}%#%{$reset_color%}%b '
@@ -69,12 +69,12 @@ fi
 function preexec() { # Hook
     if { _we_are_in_gnu_screen } then
         # Set the window title of GNU Screen.
-        local cmd=${1[(wr)^(*=*|sudo|nice|env|time|-*|[0-9]*)]}
+        local cmd=${1[(wr)^(*=*|sudo|nice|env|time|ssh|-*|[0-9]*)]}
         printf "\ek$cmd\e\\"
     fi
 }
 
-function chpwd() { # Hook
+function precmd() { # Hook
     local dirinfo=$(print_directory_info $(pwd))
 
     case $dirinfo in
@@ -93,14 +93,24 @@ function print_directory_info() {
         git branch --no-color 2>/dev/null \
             | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'
 
-    elif [[ -d $absdir/.hg ]] then
+    elif [[ -r $absdir/.hg/branch ]] then
         # Hg
-        hg branch 2>/dev/null
+       local hgbranch=`cat $absdir/.hg/branch`
+        if [[ -e $absdir/.hg/unpushed ]] then
+            echo "*${hgbranch}*"
+        else
+            echo "$hgbranch"
+        fi
 
     elif [[ -d $absdir/_darcs ]] then
         # Darcs
         basename $absdir
 
+    elif [[ -r $absdir/CVS/Repository ]] then
+        # CVS
+        cat $absdir/CVS/Repository \
+            | sed -e 's!\([^/]*\).*!\1!'
+
     else
         # Unknown.
         if [[ $absdir = "/" ]] then
@@ -112,7 +122,6 @@ function print_directory_info() {
         fi
     fi
 }
-chpwd
 
 HISTFILE="$HOME/.zhistory"
 HISTSIZE=6000000
@@ -137,12 +146,13 @@ alias pstow="pushd /usr/local/stow"
 alias w3m="w3m -O UTF-8"
 alias w3mb="w3m -O UTF-8 -B"
 alias pkgsrc="pushd /usr/pkgsrc"
+alias man="LANG=C man"
 
 alias aria="ssh -X admin@aria.cielonegro.org"
 alias nem="ssh -X pho@nem.cielonegro.org"
 alias mikasa="ssh -X daimon@mikasa.tomilab.net"
 
-alias aria-emacs="ssh -f -X admin@aria.cielonegro.org emacs"
+alias aria-emacs="ssh -f -X admin@aria.cielonegro.org emacsclient -c"
 
 alias g1="ssh pho@g1.cuenote.jp"
 alias g2="ssh pho@g2.cuenote.jp"