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

Merge branch 'master' into ast

Browse Source 
Conflicts:
	complete.cpp
This commit is contained in:
ridiculousfish
2013-10-27 13:37:14 -07:00
parent 630b0515ad cf766b55cc
commit 964c7e6f3b
28 changed files with 167 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
builtin.cpp
View File

@@ -1618,24 +1618,24 @@ static int builtin_echo(parser_t &parser, wchar_t **argv)
{
case L'n':
print_newline = false;
break;
break;
case L'e':
interpret_special_chars = true;
break;
break;
case L's':
// fish-specific extension,
// which we should try to nix
print_spaces = false;
break;
break;
case L'E':
interpret_special_chars = false;
break;
break;
}
}
}
else
{
invalid_echo_option:
invalid_echo_option:
break;
}
argv++;