1 files changed, 2 insertions, 0 deletions
diff --git a/eval.c b/eval.c
index 9908f22d..288993d6 100644
--- a/eval.c
+++ b/eval.c
@@ -88,6 +88,7 @@ reader_loop ()
 	    {
 	      /* Some kind of throw to top_level has occured. */
 	    case FORCE_EOF:
+	    case ERREXIT:
 	    case EXITPROG:
 	      current_command = (COMMAND *)NULL;
 	      if (exit_immediately_on_error)
@@ -170,6 +171,7 @@ alrm_catcher(i)
      int i;
 {
   printf ("\007timed out waiting for input: auto-logout\n");
+  bash_logout ();	/* run ~/.bash_logout if this is a login shell */
   jump_to_top_level (EXITPROG);
   SIGRETURN (0);
 }