mainline.diff (4866B)
1 diff --git a/src/nnn.c b/src/nnn.c 2 index d7c53166..bb7ff3e8 100644 3 --- a/src/nnn.c 4 +++ b/src/nnn.c 5 @@ -6262,12 +6262,12 @@ static void show_help(const char *path) 6 "2(___n))\n" 7 "0\n" 8 "1NAVIGATION\n" 9 - "9Up k Prev%14PgUp ^U Page up\n" 10 - "9Dn j Next%14PgDn ^D Page down\n" 11 + "9Up e Prev%14PgUp ^U Page up\n" 12 + "9Dn n Next%14PgDn ^D Page down\n" 13 "9Lt h Parent%12~ ` @ - ~, /, start, prev\n" 14 - "5Ret Rt l Open%20' First file/match\n" 15 - "9g ^A Top%21J Jump to entry/offset\n" 16 - "9G ^E End%20^J Toggle auto-advance on open\n" 17 + "5Ret Rt i Open%20' First file/match\n" 18 + "9g ^E Top%21J Jump to entry/offset\n" 19 + "9G ^N End%20^J Toggle auto-advance on open\n" 20 "8B (,) Book(mark)%11b ^/ Select bookmark\n" 21 "a1-8 Context%11(Sh)Tab Cycle/new context\n" 22 "62Esc ^Q Quit%19^y Next young\n" 23 @@ -6277,27 +6277,27 @@ static void show_help(const char *path) 24 "4q Alt+Esc Quit context%12d Detail mode toggle\n" 25 "0\n" 26 "1FILTER & PROMPT\n" 27 - "c/ Filter%17^N Toggle type-to-nav\n" 28 + "c/ Filter%17^K Toggle type-to-nav\n" 29 "aEsc Exit prompt%12^L Clear/apply filter\n" 30 "c. Toggle hidden\n" 31 "0\n" 32 "1FILES\n" 33 - "9o ^O Open with%15n Create new/link\n" 34 + "9o ^O Open with%15c Create new/link\n" 35 "9f ^F File stats%14P Preview toggle\n" 36 "b^R Rename/dup%14r Batch rename\n" 37 - "cz Archive%17e Edit file\n" 38 + "cz Archive%17y Edit file\n" 39 "c* Toggle exe%14> Export list\n" 40 "6Space + (Un)select%12m-m Select range/clear\n" 41 "ca Select all%14A Invert sel\n" 42 "9p ^P Copy here%12w ^W Cp/mv sel as\n" 43 - "9v ^V Move here%15E Edit sel list\n" 44 + "9v ^V Move here%15l Edit sel list\n" 45 "9x ^X Delete or trash%09S Listed sel size\n" 46 "cX Delete (rm -rf)%07Esc Send to FIFO\n" 47 "0\n" 48 "1MISC\n" 49 "8Alt ; Select plugin%11= Launch app\n" 50 "9! ^] Shell%19] Cmd prompt\n" 51 - "cc Connect remote%10u Unmount remote/archive\n" 52 + "cC Connect remote%10u Unmount remote/archive\n" 53 "9t ^T Sort toggles%12s Manage session\n" 54 "cT Set time type%110 Lock\n" 55 "b^L Redraw%18? Help, conf\n" 56 diff --git a/src/nnn.h b/src/nnn.h 57 index bd500244..43b7fa22 100644 58 --- a/src/nnn.h 59 +++ b/src/nnn.h 60 @@ -139,12 +139,12 @@ static struct key bindings[] = { 61 { '\r', SEL_OPEN }, 62 /* Pure navigate inside */ 63 { KEY_RIGHT, SEL_NAV_IN }, 64 - { 'l', SEL_NAV_IN }, 65 + { 'i', SEL_NAV_IN }, 66 /* Next */ 67 - { 'j', SEL_NEXT }, 68 + { 'n', SEL_NEXT }, 69 { KEY_DOWN, SEL_NEXT }, 70 /* Previous */ 71 - { 'k', SEL_PREV }, 72 + { 'e', SEL_PREV }, 73 { KEY_UP, SEL_PREV }, 74 /* Page down */ 75 { KEY_NPAGE, SEL_PGDN }, 76 @@ -157,11 +157,11 @@ static struct key bindings[] = { 77 /* First entry */ 78 { KEY_HOME, SEL_HOME }, 79 { 'g', SEL_HOME }, 80 - { CONTROL('A'), SEL_HOME }, 81 + { CONTROL('E'), SEL_HOME }, 82 /* Last entry */ 83 { KEY_END, SEL_END }, 84 { 'G', SEL_END }, 85 - { CONTROL('E'), SEL_END }, 86 + { CONTROL('N'), SEL_END }, 87 /* Go to first file */ 88 { '\'', SEL_FIRST }, 89 /* Jump to an entry number/offset */ 90 @@ -179,7 +179,7 @@ static struct key bindings[] = { 91 { 'b', SEL_BMOPEN }, 92 { CONTROL('_'), SEL_BMOPEN }, 93 /* Connect to server over SSHFS */ 94 - { 'c', SEL_REMOTE }, 95 + { 'C', SEL_REMOTE }, 96 /* Cycle contexts in forward direction */ 97 { '\t', SEL_CYCLE }, 98 /* Cycle contexts in reverse direction */ 99 @@ -202,7 +202,7 @@ static struct key bindings[] = { 100 /* Filter */ 101 { '/', SEL_FLTR }, 102 /* Toggle filter mode */ 103 - { CONTROL('N'), SEL_MFLTR }, 104 + { CONTROL('K'), SEL_MFLTR }, 105 /* Toggle hide .dot files */ 106 { '.', SEL_HIDDEN }, 107 /* Detailed listing */ 108 @@ -229,7 +229,7 @@ static struct key bindings[] = { 109 /* Invert selection in current dir */ 110 { 'A', SEL_SELINV }, 111 /* List, edit selection */ 112 - { 'E', SEL_SELEDIT }, 113 + { 'l', SEL_SELEDIT }, 114 /* Copy from selection buffer */ 115 { 'p', SEL_CP }, 116 { CONTROL('P'), SEL_CP }, 117 @@ -247,7 +247,7 @@ static struct key bindings[] = { 118 { 'o', SEL_OPENWITH }, 119 { CONTROL('O'), SEL_OPENWITH }, 120 /* Create a new file */ 121 - { 'n', SEL_NEW }, 122 + { 'c', SEL_NEW }, 123 /* Show rename prompt */ 124 { CONTROL('R'), SEL_RENAME }, 125 /* Rename contents of current dir */ 126 @@ -259,7 +259,7 @@ static struct key bindings[] = { 127 /* Toggle auto-advance on file open */ 128 { CONTROL('J'), SEL_AUTONEXT }, 129 /* Edit in EDITOR */ 130 - { 'e', SEL_EDIT }, 131 + { 'y', SEL_EDIT }, 132 /* Run a plugin */ 133 { ';', SEL_PLUGIN }, 134 /* Show total size of listed selection */