Auto commit by The Sugar System.

diff --git a/dot-files/_screenrc b/dot-files/_screenrc
index 78c9d7d61ee82e52e97eb4ce5f75e5de92bc1041..c841dbd15936fb58f1811a8bd2d9ba7ce5ea423e 100644 (file)
--- a/dot-files/_screenrc
+++ b/dot-files/_screenrc
@@ -1,10 +1,8 @@
 escape ^Z^Z
-vbell off
+vbell on
 
 defscrollback 50000
 defutf8 on
 defflow off
 
-#shelltitle '% |zsh'
-
 hardstatus alwayslastline "[%02c]:%H: %`%-w%{=b rw}%n %t%{-}%+w"

diff --git a/dot-files/_zshrc b/dot-files/_zshrc
index 145fabb97b46e26d92b4cbda37fa00f772d6a2cb..f115c4c4e29c6674b67a7809cbb674f5e1c09ae1 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 '
@@ -191,16 +195,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