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

Merge pull request #1881 from N-R-K/colemak-collision

Browse source 
fix collision in colemak patch
This commit is contained in:
Arun 2024-05-18 05:43:44 +05:30 committed by GitHub
parent 9e95578c22 4f3662cf88
commit e27d059552
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
patches/colemak/mainline.diff
View file

@ -1,8 +1,8 @@
diff --git a/src/nnn.c b/src/nnn.c diff --git a/src/nnn.c b/src/nnn.c
index 6792d503..0a59e8e3 100644 index d7c53166..bb7ff3e8 100644
--- a/src/nnn.c --- a/src/nnn.c
+++ b/src/nnn.c +++ b/src/nnn.c
@@ -5148,12 +5148,12 @@ static void show_help(const char *path) @@ -5149,12 +5149,12 @@ static void show_help(const char *path)
"2(___n))\n" "2(___n))\n"
"0\n" "0\n"
"1NAVIGATION\n" "1NAVIGATION\n"
@ -20,12 +20,12 @@ index 6792d503..0a59e8e3 100644
"8B (,) Book(mark)%11b ^/ Select bookmark\n" "8B (,) Book(mark)%11b ^/ Select bookmark\n"
"a1-4 Context%11(Sh)Tab Cycle/new context\n" "a1-4 Context%11(Sh)Tab Cycle/new context\n"
"62Esc ^Q Quit%19^y Next young\n" "62Esc ^Q Quit%19^y Next young\n"
@@ -5161,20 +5161,20 @@ static void show_help(const char *path) @@ -5162,27 +5162,27 @@ static void show_help(const char *path)
"cq Quit context\n" "cq Quit context\n"
"0\n" "0\n"
"1FILTER & PROMPT\n" "1FILTER & PROMPT\n"
- "c/ Filter%17^N Toggle type-to-nav\n" - "c/ Filter%17^N Toggle type-to-nav\n"
+ "c/ Filter%17^M Toggle type-to-nav\n" + "c/ Filter%17^K Toggle type-to-nav\n"
"aEsc Exit prompt%12^L Toggle last filter\n" "aEsc Exit prompt%12^L Toggle last filter\n"
"c. Toggle hidden%05Alt+Esc Unfilter, quit context\n" "c. Toggle hidden%05Alt+Esc Unfilter, quit context\n"
"0\n" "0\n"
@ -45,8 +45,16 @@ index 6792d503..0a59e8e3 100644
"9x ^X Delete or trash%09S Listed sel size\n" "9x ^X Delete or trash%09S Listed sel size\n"
"cX Delete (rm -rf)%07Esc Send to FIFO\n" "cX Delete (rm -rf)%07Esc Send to FIFO\n"
"0\n" "0\n"
"1MISC\n"
"8Alt ; Select plugin%11= Launch app\n"
"9! ^] Shell%19] Cmd prompt\n"
- "cc Connect remote%10u Unmount remote/archive\n"
+ "cC Connect remote%10u Unmount remote/archive\n"
"9t ^T Sort toggles%12s Manage session\n"
"cT Set time type%110 Lock\n"
"b^L Redraw%18? Help, conf\n"
diff --git a/src/nnn.h b/src/nnn.h diff --git a/src/nnn.h b/src/nnn.h
index bd500244..b12df5c0 100644 index bd500244..43b7fa22 100644
--- a/src/nnn.h --- a/src/nnn.h
+++ b/src/nnn.h +++ b/src/nnn.h
@@ -139,12 +139,12 @@ static struct key bindings[] = { @@ -139,12 +139,12 @@ static struct key bindings[] = {
@ -79,12 +87,21 @@ index bd500244..b12df5c0 100644
/* Go to first file */ /* Go to first file */
{ '\'', SEL_FIRST }, { '\'', SEL_FIRST },
/* Jump to an entry number/offset */ /* Jump to an entry number/offset */
@@ -179,7 +179,7 @@ static struct key bindings[] = {
{ 'b', SEL_BMOPEN },
{ CONTROL('_'), SEL_BMOPEN },
/* Connect to server over SSHFS */
- { 'c', SEL_REMOTE },
+ { 'C', SEL_REMOTE },
/* Cycle contexts in forward direction */
{ '\t', SEL_CYCLE },
/* Cycle contexts in reverse direction */
@@ -202,7 +202,7 @@ static struct key bindings[] = { @@ -202,7 +202,7 @@ static struct key bindings[] = {
/* Filter */ /* Filter */
{ '/', SEL_FLTR }, { '/', SEL_FLTR },
/* Toggle filter mode */ /* Toggle filter mode */
- { CONTROL('N'), SEL_MFLTR }, - { CONTROL('N'), SEL_MFLTR },
+ { CONTROL('M'), SEL_MFLTR }, + { CONTROL('K'), SEL_MFLTR },
/* Toggle hide .dot files */ /* Toggle hide .dot files */
{ '.', SEL_HIDDEN }, { '.', SEL_HIDDEN },
/* Detailed listing */ /* Detailed listing */