From b67526aae8a28a4870edc51ad46a002c6ecf0ecf Mon Sep 17 00:00:00 2001 From: ridiculousfish Date: Fri, 5 Oct 2012 18:23:38 -0700 Subject: Don't reset the terminal mode in certain circumstances. Fixes issue in Linux with e.g. echo foo ; ftp Introduce patch from https://github.com/adityagodbole/fish-shell/commit/9d229cd18c3e5c25a8bd37e9ddd3b67ddc2d1b72 --- proc.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/proc.cpp b/proc.cpp index 26b80bbe..59d64ee9 100644 --- a/proc.cpp +++ b/proc.cpp @@ -1000,6 +1000,11 @@ static int terminal_return_from_job( job_t *j) return 0; } + /* Disabling this per https://github.com/adityagodbole/fish-shell/commit/9d229cd18c3e5c25a8bd37e9ddd3b67ddc2d1b72 + On Linux, 'cd . ; ftp' prevents you from typing into the ftp prompt + See https://github.com/fish-shell/fish-shell/issues/121 + */ +#if 0 /* Restore the shell's terminal modes. */ @@ -1009,6 +1014,7 @@ static int terminal_return_from_job( job_t *j) wperror( L"tcsetattr" ); return 0; } +#endif return 1; } -- cgit v1.2.3