From a6ec2dc3ed52806f2de974566af2bef4695dbc6a Mon Sep 17 00:00:00 2001 From: Aaron Gyes Date: Sat, 25 Jun 2016 00:56:25 -0700 Subject: Remove oopsies while pasting. (also, last commit log had a typo. "3.4.0-Microsoft" is the string we should check for. Actual string in my code was correct.) --- src/fish.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/fish.cpp') diff --git a/src/fish.cpp b/src/fish.cpp index b50a79b7..1d71e2c5 100644 --- a/src/fish.cpp +++ b/src/fish.cpp @@ -410,11 +410,11 @@ static int fish_parse_opt(int argc, char **argv, std::vector *cmds) /// routines. static void misc_init() { #ifdef OS_IS_CYGWIN - if (cmdfile) fclose(cmdfile) - // MS Windows tty devices do not currently have either a read or write timestamp. Those respective fields - // of `struct stat` are always the current time. Which means we can't use them. So we assume no - // external program has written to the terminal behind our back. This makes multiline prompts - // usable. See issue #2859 and https://github.com/Microsoft/BashOnWindows/issues/545 + // MS Windows tty devices do not currently have either a read or write timestamp. Those + // respective fields of `struct stat` are always the current time. Which means we can't + // use them. So we assume no external program has written to the terminal behind our + // back. This makes multiline promptusable. See issue #2859 and + // https://github.com/Microsoft/BashOnWindows/issues/545 has_working_tty_timestamps = false; #else // This covers preview builds of Windows Subsystem for Linux (WSL). @@ -426,7 +426,9 @@ static void misc_init() { has_working_tty_timestamps = false; } } - if (procsyskosrel) { fclose(procsyskosrel); } + if (procsyskosrel) { + fclose(procsyskosrel); + } #endif // OS_IS_MS_WINDOWS } -- cgit v1.2.3