aboutsummaryrefslogtreecommitdiffhomepage
path: root/proc.cpp
diff options
context:
space:
mode:
authorGravatar ridiculousfish <corydoras@ridiculousfish.com>2012-10-05 18:23:38 -0700
committerGravatar ridiculousfish <corydoras@ridiculousfish.com>2012-10-05 18:23:38 -0700
commitb67526aae8a28a4870edc51ad46a002c6ecf0ecf (patch)
treee0c8c6050eb9c9c4e50205a92fe774758ffeb6d4 /proc.cpp
parent14bf057c6292f6d074e57f4857b3e2511c2d7f09 (diff)
Don't reset the terminal mode in certain circumstances. Fixes issue in Linux with e.g. echo foo ; ftp
Diffstat (limited to 'proc.cpp')
-rw-r--r--proc.cpp6
1 files changed, 6 insertions, 0 deletions
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;
}