h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-08 02:31:18 -03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ast_templates

Browse Source 
Conflicts:
	fish_tests.cpp
This commit is contained in:
ridiculousfish
2013-07-21 14:04:06 -07:00
parent 93f27666db f9c2a77c67
commit 551d2dfebd
22 changed files with 756 additions and 460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
builtin.cpp
View File

@@ -1660,7 +1660,7 @@ static int builtin_echo(parser_t &parser, wchar_t **argv)
wc = L'\b';
break;
case L'e':
wc = L'\e';
wc = L'\x1B';
break;
case L'f':
wc = L'\f';
@@ -2372,8 +2372,9 @@ static int builtin_read(parser_t &parser, wchar_t **argv)
reader_set_highlight_function(&highlight_shell);
reader_set_test_function(&reader_shell_test);
}
/* No autosuggestions in builtin_read */
/* No autosuggestions or abbreviations in builtin_read */
reader_set_allow_autosuggesting(false);
reader_set_expand_abbreviations(false);
reader_set_exit_on_interrupt(true);
reader_set_buffer(commandline, wcslen(commandline));