X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=shell%2Frc;h=d0261bbae3c65d61602328506034568c163c596b;hb=b989d9f7f42034ee72f5458d04df1e224e6a3d50;hp=c3cfade3fe47375778746c16d279912d2e4d159e;hpb=9b975c15a2b8ab40b76e4f3922b43df1ec2c149c;p=config%2Fdotfiles.git

diff --git a/shell/rc b/shell/rc
index c3cfade..d0261bb 100644
--- a/shell/rc
+++ b/shell/rc
@@ -1,6 +1,6 @@
 # Shell configuration file.
 
-# Copyright (C) 2013  Simon Ruderich
+# Copyright (C) 2013-2014  Simon Ruderich
 #
 # This file is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,9 +24,9 @@ else
     umask 077
 fi
 
-# Disable flow control (^s ^q). I use GNU Screen/Tmux which also supports this
-# in a similar way (entering copy mode) and enabling flow control by accident
-# is annoying.
+# Disable flow control (^s and ^q). I use GNU Screen/Tmux which also supports
+# this in a similar way (entering copy mode) and enabling flow control by
+# accident is annoying.
 if test -t 0; then
     stty -ixon -ixoff
 fi
@@ -49,10 +49,10 @@ timeout_setup_tmux_lock() {
         echo "Falling back to shell timeout." >&2
         echo
 
-        timeout_setup_shell_lock
+        timeout_setup_shell_logout
     fi
 }
-timeout_setup_shell_lock() {
+timeout_setup_shell_logout() {
     echo "Auto-logout after $timeout seconds (TTY detected)."
     TMOUT=$timeout
     echo
@@ -97,14 +97,14 @@ case "$TERM" in
             esac
         else
             echo 'TERM=screen but neither $STY nor $TMUX found!' >&2
-            timeout_setup_shell_lock
+            timeout_setup_shell_logout
         fi
         ;;
 
     *)
         case `tty` in
             /dev/tty[0-9]*)
-                timeout_setup_shell_lock
+                timeout_setup_shell_logout
                 ;;
         esac
         ;;