h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-24 05:41:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

Remove oopsies while pasting.

Browse Source 
(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.)
This commit is contained in:
Aaron Gyes
2016-06-25 00:56:25 -07:00
parent 6ec83568b5
commit a6ec2dc3ed
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/fish.cpp
View File

@@ -410,11 +410,11 @@ static int fish_parse_opt(int argc, char **argv, std::vector<std::string> *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
}

4
src/fish_tests.cpp
View File

@@ -2255,8 +2255,7 @@ static int test_universal_helper(int *x) {
static void test_universal() {
say(L"Testing universal variables");
if (system("mkdir -p /tmp/fish_uvars_test/"))
err(L"mkdir failed");
if (system("mkdir -p /tmp/fish_uvars_test/")) err(L"mkdir failed");
const int threads = 16;
static int ctx[threads];
@@ -2732,7 +2731,6 @@ void history_tests_t::test_history_merge(void) {
do_test(string_rep == string_rep2);
}
// Add some more per-history items.
for (size_t i = 0; i < count; i++) {
hists[i]->add(alt_texts[i]);