Auto commit by The Sugar System.

[sugar.git] / dot-files / _zshrc

diff --git a/dot-files/_zshrc b/dot-files/_zshrc
index 6543f982d4676a773eb83380c09e7f109d966ef8..0bd22e73f0af27ac4c64da5dde09c29a4140f86c 100644 (file)
--- a/dot-files/_zshrc
+++ b/dot-files/_zshrc
@@ -53,7 +53,11 @@ setopt inc_append_history
 setopt share_history
 
 function _we_are_in_gnu_screen () {
-    [ "$WINDOW" != "" ]
+    [[ -n "$WINDOW" ]]
+}
+
+function _we_are_in_ssh_session () {
+    [[ -n "$SSH_CONNECTION" ]]
 }
 
 _prompt_base='%B[%n@%m] %{%(?.$fg[green].$fg[red])%}%#%{$reset_color%}%b '
@@ -69,12 +73,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,9 +97,14 @@ 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
@@ -117,7 +126,6 @@ function print_directory_info() {
         fi
     fi
 }
-chpwd
 
 HISTFILE="$HOME/.zhistory"
 HISTSIZE=6000000
@@ -127,6 +135,7 @@ alias -g L="| $PAGER"
 alias -g G="| grep"
 alias -g H="| head"
 alias -g T="| tail"
+alias -g X="| hexdump -C"
 
 alias ..='cd ..'
 alias cd..='cd ..'
@@ -142,12 +151,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"
@@ -159,6 +169,7 @@ if [ $(hostname) = "aria.cielonegro.org" ]; then
     alias pa='open -a NiseRingo.app'
     alias heboris='open /Applications/HeborisUEMac/exe/Heboris\ OpenGL.app'
     alias hengband='open ~/Applications/hengband*/Hengband*'
+    alias syssleep='sudo shutdown -s now'
 fi
 
 if [ $(uname) = "Darwin" ]; then
@@ -185,16 +196,24 @@ autoload -U compinit
 compinit
 # End of lines added by compinstall
 
-if [ "x$WINDOW" = "x" ]; then
+if ( _we_are_in_gnu_screen ); then
+    # When we are in a GNU Screen session...
+
+    if ( _we_are_in_ssh_session ); then
+        # Propagate remote session's bells to the local one.
+        screen -X vbell off
+    fi
+else
+    if [ -e ".motd" ]; then
+        cat ".motd"
+    fi
+
+    # Run "fortune" if we aren't in a GNU Screen session.
     if which fortune 2>&1 >/dev/null; then
         fortune
     fi
 fi
 
-if [ -e ".motd" ]; then
-    cat .motd
-fi
-
 if which ssh-agent-manager 2>&1 >/dev/null; then
     eval `ssh-agent-manager -s`
 fi