Permalink
Browse files

Increased support for completion search field. Use btab (shift-tab) to

complete-and-search.
  • Loading branch information...
1 parent ce4c145 commit 5be3606236bd2185d93162fcad097d8c30f84885 @ridiculousfish ridiculousfish committed Jan 27, 2014
Showing with 425 additions and 167 deletions.
  1. +8 −29 builtin.cpp
  2. +2 −0 input.cpp
  3. +1 −0 input.h
  4. +0 −1 input_common.cpp
  5. +162 −38 pager.cpp
  6. +31 −1 pager.h
  7. +194 −90 reader.cpp
  8. +9 −0 reader.h
  9. +10 −7 screen.cpp
  10. +4 −1 screen.h
  11. +4 −0 share/functions/fish_default_key_bindings.fish
View
@@ -571,35 +571,14 @@ static int builtin_bind(parser_t &parser, wchar_t **argv)
static const struct woption
long_options[] =
{
- {
- L"all", no_argument, 0, 'a'
- }
- ,
- {
- L"erase", no_argument, 0, 'e'
- }
- ,
- {
- L"function-names", no_argument, 0, 'f'
- }
- ,
- {
- L"help", no_argument, 0, 'h'
- }
- ,
- {
- L"key", no_argument, 0, 'k'
- }
- ,
- {
- L"key-names", no_argument, 0, 'K'
- }
- ,
- {
- 0, 0, 0, 0
- }
- }
- ;
+ { L"all", no_argument, 0, 'a' },
+ { L"erase", no_argument, 0, 'e' },
+ { L"function-names", no_argument, 0, 'f' },
+ { L"help", no_argument, 0, 'h' },
+ { L"key", no_argument, 0, 'k' },
+ { L"key-names", no_argument, 0, 'K' },
+ { 0, 0, 0, 0 }
+ };
while (1)
{
View
@@ -104,6 +104,7 @@ static const wchar_t * const name_arr[] =
L"yank",
L"yank-pop",
L"complete",
+ L"complete-and-search",
L"beginning-of-history",
L"end-of-history",
L"backward-kill-line",
@@ -201,6 +202,7 @@ static const wchar_t code_arr[] =
R_YANK,
R_YANK_POP,
R_COMPLETE,
+ R_COMPLETE_AND_SEARCH,
R_BEGINNING_OF_HISTORY,
R_END_OF_HISTORY,
R_BACKWARD_KILL_LINE,
View
@@ -33,6 +33,7 @@ enum
R_YANK,
R_YANK_POP,
R_COMPLETE,
+ R_COMPLETE_AND_SEARCH,
R_BEGINNING_OF_HISTORY,
R_END_OF_HISTORY,
R_BACKWARD_KILL_LINE,
View
@@ -251,7 +251,6 @@ wchar_t input_common_readch(int timed)
case 0:
return 0;
default:
-
return res;
}
}
Oops, something went wrong.

0 comments on commit 5be3606

Please sign in to comment.