mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-11-24 20:01:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant key F5

Browse source
This commit is contained in:
Arun Prakash Jana 2020-05-31 23:20:08 +05:30
parent 7263a5f89b
commit 8549121d86
No known key found for this signature in database
GPG key ID: A75979F35C080412
2 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/nnn.c
View file

@ -2569,23 +2569,18 @@ static int filterentries(char *path, char *lastname)
} else } else
continue; continue;
// fallthrough // fallthrough
case KEY_F(5): // fallthrough
case CONTROL('L'): case CONTROL('L'):
if (*ch == CONTROL('L') || *ch == KEY_F(5)) { if (*ch == CONTROL('L')) {
if (wln[1]) { if (wln[1]) {
ln[REGEX_MAX - 1] = ln[1]; ln[REGEX_MAX - 1] = ln[1];
ln[1] = wln[1] = '\0'; ln[1] = wln[1] = '\0';
len = 1; len = 1;
ndents = total; ndents = total;
} else if (*ch == CONTROL('L') && ln[REGEX_MAX - 1]) { } else if (ln[REGEX_MAX - 1]) { /* Show the previous filter */
/* Show the previous filter */
ln[1] = ln[REGEX_MAX - 1]; ln[1] = ln[REGEX_MAX - 1];
ln[REGEX_MAX - 1] = '\0'; ln[REGEX_MAX - 1] = '\0';
len = mbstowcs(wln, ln, REGEX_MAX); len = mbstowcs(wln, ln, REGEX_MAX);
} }
if (*ch == KEY_F(5))
goto end;
} }
/* Go to the top, we don't know if the hovered file will match the filter */ /* Go to the top, we don't know if the hovered file will match the filter */
@ -4141,7 +4136,6 @@ static void show_help(const char *path)
"a1-4 Context 1-4%-7c(Sh)Tab Cycle context\n" "a1-4 Context 1-4%-7c(Sh)Tab Cycle context\n"
"c/ Filter%-17c^N Toggle type-to-nav\n" "c/ Filter%-17c^N Toggle type-to-nav\n"
"aEsc Exit prompt%-12c^L Redraw/clear prompt\n" "aEsc Exit prompt%-12c^L Redraw/clear prompt\n"
"c0 Lock%-19cF5 Redraw\n"
"c? Help, conf%-13c^G QuitCD\n" "c? Help, conf%-13c^G QuitCD\n"
"cq Quit context%-7c^Q (Q) Quit (with err)\n" "cq Quit context%-7c^Q (Q) Quit (with err)\n"
"1FILES\n" "1FILES\n"
@ -4159,7 +4153,7 @@ static void show_help(const char *path)
"9! ^] Shell%-19c] Cmd prompt\n" "9! ^] Shell%-19c] Cmd prompt\n"
"cc Connect remote%-10cu Unmount\n" "cc Connect remote%-10cu Unmount\n"
"9t ^T Sort toggles%-12cs Manage session\n" "9t ^T Sort toggles%-12cs Manage session\n"
"cT Set time type%-0c\n" "cT Set time type%-11c0 Lock\n"
}; };
fd = create_tmp_file(); fd = create_tmp_file();

1
src/nnn.h
View file

@ -199,7 +199,6 @@ static struct key bindings[] = {
{ CONTROL('T'), SEL_SORT }, { CONTROL('T'), SEL_SORT },
/* Redraw window */ /* Redraw window */
{ CONTROL('L'), SEL_REDRAW }, { CONTROL('L'), SEL_REDRAW },
{ KEY_F(5), SEL_REDRAW },
/* Select current file path */ /* Select current file path */
{ CONTROL('J'), SEL_SEL }, { CONTROL('J'), SEL_SEL },
{ ' ', SEL_SEL }, { ' ', SEL_SEL },