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

Merge branch 'fix-jump' of git://github.com/cpick/fish-shell into cpick-fix-jump

Browse Source
This commit is contained in:
ridiculousfish
2016-02-02 17:00:27 -08:00
parent 60a477a303 8cc154bc48
commit b4a44deb7b
3 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/input.cpp
View File

@@ -42,6 +42,7 @@
#include "output.h"
#include <vector>
#include <algorithm>
#include <deque>
#define DEFAULT_TERM L"ansi"
#define MAX_INPUT_FUNCTION_ARGS 20
@@ -538,10 +539,23 @@ wchar_t input_function_pop_arg()
void input_function_push_args(int code)
{
int arity = input_function_arity(code);
std::deque<wchar_t> skipped;
for (int i = 0; i < arity; i++)
{
input_function_push_arg(input_common_readch(0));
wchar_t arg;
// skip and queue up any function codes
while(((arg = input_common_readch(0)) >= R_MIN) && (arg <= R_MAX))
{
skipped.push_front(arg);
}
input_function_push_arg(arg);
}
// push the function codes back into the input stream
std::for_each(skipped.begin(), skipped.end(), input_common_next_ch);
}
/**