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

fix handling input in the C locale

Browse Source 
In the C/POSIX locale EOF on the tty wasn't handled correctly due to a change
a few months ago to fix an unrelated problem with that locale. What is
surprising is that the core fish code doesn't explicitly depend on
input_common_readch returning WEOF if a character isn't seen within
`wait_on_escape_ms` after an escape.

Fixes #3214
This commit is contained in:
Kurtis Rader
2016-07-11 20:31:30 -07:00
parent 2a119ff082
commit f3e93f0666
11 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/reader.cpp
View File

@@ -3250,7 +3250,7 @@ const wchar_t *reader_readline(int nchars) {
}
default: {
// Other, if a normal character, we add it to the command.
if ((!wchar_private(c)) && (((c > 31) || (c == L'\n')) && (c != 127))) {
if (!wchar_private(c) && (c >= L' ' || c == L'\n' || c == L'\r') && c != 0x7F) {
bool allow_expand_abbreviations = false;
if (data->is_navigating_pager_contents()) {
data->pager.set_search_field_shown(true);
@@ -3266,11 +3266,10 @@ const wchar_t *reader_readline(int nchars) {
if (el == &data->command_line) {
clear_pager();
}
} else {
// Low priority debug message. These can happen if the user presses an unefined
// control sequnece. No reason to report.
debug(2, _(L"Unknown keybinding %d"), c);
// This can happen if the user presses a control char we don't recognize. No
// reason to report this to the user unless they've enabled debugging output.
debug(2, _(L"Unknown key binding 0x%X"), c);
}
break;
}