fix failing colemak patches

diff --git a/patches/colemak-dh/mainline.diff b/patches/colemak-dh/mainline.diff
index 6d16fcceaee4041d63717f3b1e41ba493f21f5af..60e1cdf782c306a3c37448ba5ac2917e316df535 100644 (file)
--- a/patches/colemak-dh/mainline.diff
+++ b/patches/colemak-dh/mainline.diff
@@ -4,63 +4,63 @@
 # Author: github.com/anjerukare
 
 diff --git a/src/nnn.c b/src/nnn.c
-index b821f808..87ebfbbf 100644
+index ecedee43..9d779f90 100644
 --- a/src/nnn.c
 +++ b/src/nnn.c
-@@ -5050,40 +5050,40 @@ static void show_help(const char *path)
-       const char helpstr[] = {
+@@ -5098,40 +5098,40 @@ static void show_help(const char *path)
+       "2(___n))\n"
        "0\n"
        "1NAVIGATION\n"
--             "9Up k  Up%-16cPgUp ^U  Page up\n"
--             "9Dn j  Down%-14cPgDn ^D  Page down\n"
--             "9Lt h  Parent%-12c~ ` @ -  ~, /, start, prev\n"
--         "5Ret Rt l  Open%-20c'  First file/match\n"
--             "9g ^A  Top%-21cJ  Jump to entry/offset\n"
--             "9G ^E  End%-20c^J  Toggle auto-advance on open\n"
-+             "9Up e  Up%-16cPgUp ^U  Page up\n"
-+             "9Dn n  Down%-14cPgDn ^D  Page down\n"
-+             "9Lt m  Parent%-12c~ ` @ -  ~, /, start, prev\n"
-+         "5Ret Rt i  Open%-20c'  First file/match\n"
-+             "9g ^E  Top%-21cJ  Jump to entry/offset\n"
-+             "9G ^N  End%-20c^J  Toggle auto-jump on open\n"
-             "8B (,)  Book(mark)%-11cb ^/  Select bookmark\n"
-               "a1-4  Context%-11c(Sh)Tab  Cycle/new context\n"
-           "62Esc ^Q  Quit%-20cq  Quit context\n"
-                "b^G  QuitCD%-18cQ  Pick/err, quit\n"
+-             "9Up k  Up%16PgUp ^U  Page up\n"
+-             "9Dn j  Down%14PgDn ^D  Page down\n"
+-             "9Lt h  Parent%12~ ` @ -  ~, /, start, prev\n"
+-         "5Ret Rt l  Open%20'  First file/match\n"
+-             "9g ^A  Top%21J  Jump to entry/offset\n"
+-             "9G ^E  End%20^J  Toggle auto-advance on open\n"
++             "9Up e  Up%16PgUp ^U  Page up\n"
++             "9Dn n  Down%14PgDn ^D  Page down\n"
++             "9Lt m  Parent%12~ ` @ -  ~, /, start, prev\n"
++         "5Ret Rt i  Open%20'  First file/match\n"
++             "9g ^E  Top%21J  Jump to entry/offset\n"
++             "9G ^N  End%20^J  Toggle auto-advance on open\n"
+             "8B (,)  Book(mark)%11b ^/  Select bookmark\n"
+               "a1-4  Context%11(Sh)Tab  Cycle/new context\n"
+           "62Esc ^Q  Quit%20q  Quit context\n"
+                "b^G  QuitCD%18Q  Pick/err, quit\n"
        "0\n"
        "1FILTER & PROMPT\n"
--                "c/  Filter%-17c^N  Toggle type-to-nav\n"
-+                "c/  Filter%-17c^F  Toggle type-to-nav\n"
-               "aEsc  Exit prompt%-12c^L  Toggle last filter\n"
-                 "c.  Toggle hidden%-5cAlt+Esc  Unfilter, quit context\n"
+-                "c/  Filter%17^N  Toggle type-to-nav\n"
++                "c/  Filter%17^F  Toggle type-to-nav\n"
+               "aEsc  Exit prompt%12^L  Toggle last filter\n"
+                 "c.  Toggle hidden%05Alt+Esc  Unfilter, quit context\n"
        "0\n"
        "1FILES\n"
--             "9o ^O  Open with%-15cn  Create new/link\n"
--             "9f ^F  File stats%-14cd  Detail mode toggle\n"
-+             "9o ^O  Open with%-15cc  Create new/link\n"
-+                "cf  File stats%-14cd  Detail mode toggle\n"
-                "b^R  Rename/dup%-14cr  Batch rename\n"
--                "cz  Archive%-17ce  Edit file\n"
-+                "cz  Archive%-17cy  Edit file\n"
-                 "c*  Toggle exe%-14c>  Export list\n"
--          "6Space +  (Un)select%-12cm-m  Select range/clear\n"
-+          "6Space +  (Un)select%-12cs-s  Select range/clear\n"
-                 "ca  Select all%-14cA  Invert sel\n"
-              "9p ^P  Copy here%-12cw ^W  Cp/mv sel as\n"
--             "9v ^V  Move here%-15cE  Edit sel list\n"
-+             "9v ^V  Move here%-15cl  Edit sel list\n"
-              "9x ^X  Delete%-18cS  Listed sel size\n"
+-             "9o ^O  Open with%15n  Create new/link\n"
+-             "9f ^F  File stats%14d  Detail mode toggle\n"
++             "9o ^O  Open with%15c  Create new/link\n"
++                "cf  File stats%14d  Detail mode toggle\n"
+                "b^R  Rename/dup%14r  Batch rename\n"
+-                "cz  Archive%17e  Edit file\n"
++                "cz  Archive%17y  Edit file\n"
+                 "c*  Toggle exe%14>  Export list\n"
+-          "6Space +  (Un)select%12m-m  Select range/clear\n"
++          "6Space +  (Un)select%12s-s  Select range/clear\n"
+                 "ca  Select all%14A  Invert sel\n"
+              "9p ^P  Copy here%12w ^W  Cp/mv sel as\n"
+-             "9v ^V  Move here%15E  Edit sel list\n"
++             "9v ^V  Move here%15l  Edit sel list\n"
+              "9x ^X  Delete%18S  Listed sel size\n"
                "aEsc  Send to FIFO\n"
        "0\n"
        "1MISC\n"
-             "8Alt ;  Select plugin%-11c=  Launch app\n"
-              "9! ^]  Shell%-19c]  Cmd prompt\n"
--                "cc  Connect remote%-10cu  Unmount remote/archive\n"
--             "9t ^T  Sort toggles%-12cs  Manage session\n"
-+                "ch  Connect remote%-10cu  Unmount remote/archive\n"
-+             "9t ^T  Sort toggles%-12ck  Manage session\n"
-                 "cT  Set time type%-11c0  Lock\n"
-                "b^L  Redraw%-18c?  Help, conf\n"
+             "8Alt ;  Select plugin%11=  Launch app\n"
+              "9! ^]  Shell%19]  Cmd prompt\n"
+-                "cc  Connect remote%10u  Unmount remote/archive\n"
+-             "9t ^T  Sort toggles%12s  Manage session\n"
++                "ch  Connect remote%10u  Unmount remote/archive\n"
++             "9t ^T  Sort toggles%12k  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
 index 3e4ea19c..c81ef392 100644

diff --git a/patches/colemak/mainline.diff b/patches/colemak/mainline.diff
index b6cec9c6199615de2cb701b5844227907e6a7165..09cdfe613aa45f47a4fbce6c9886eba19a44b155 100644 (file)
--- a/patches/colemak/mainline.diff
+++ b/patches/colemak/mainline.diff
@@ -3,49 +3,49 @@
 #
 # Author: github.com/jacmoe
 diff --git a/src/nnn.c b/src/nnn.c
-index b351e202..71193476 100644
+index ecedee43..fdf5a80e 100644
 --- a/src/nnn.c
 +++ b/src/nnn.c
-@@ -5050,32 +5050,32 @@ static void show_help(const char *path)
-       const char helpstr[] = {
+@@ -5098,32 +5098,32 @@ static void show_help(const char *path)
+       "2(___n))\n"
        "0\n"
        "1NAVIGATION\n"
--             "9Up k  Up%-16cPgUp ^U  Page up\n"
--             "9Dn j  Down%-14cPgDn ^D  Page down\n"
-+             "9Up e  Up%-16cPgUp ^U  Page up\n"
-+             "9Dn n  Down%-14cPgDn ^D  Page down\n"
-              "9Lt h  Parent%-12c~ ` @ -  ~, /, start, prev\n"
--         "5Ret Rt l  Open%-20c'  First file/match\n"
--             "9g ^A  Top%-21cJ  Jump to entry/offset\n"
--             "9G ^E  End%-20c^J  Toggle auto-advance on open\n"
-+         "5Ret Rt i  Open%-20c'  First file/match\n"
-+             "9g ^E  Top%-21cJ  Jump to entry/offset\n"
-+             "9G ^N  End%-20c^J  Toggle auto-advance on open\n"
-             "8B (,)  Book(mark)%-11cb ^/  Select bookmark\n"
-               "a1-4  Context%-11c(Sh)Tab  Cycle/new context\n"
-           "62Esc ^Q  Quit%-20cq  Quit context\n"
-                "b^G  QuitCD%-18cQ  Pick/err, quit\n"
+-             "9Up k  Up%16PgUp ^U  Page up\n"
+-             "9Dn j  Down%14PgDn ^D  Page down\n"
++             "9Up e  Up%16PgUp ^U  Page up\n"
++             "9Dn n  Down%14PgDn ^D  Page down\n"
+              "9Lt h  Parent%12~ ` @ -  ~, /, start, prev\n"
+-         "5Ret Rt l  Open%20'  First file/match\n"
+-             "9g ^A  Top%21J  Jump to entry/offset\n"
+-             "9G ^E  End%20^J  Toggle auto-advance on open\n"
++         "5Ret Rt i  Open%20'  First file/match\n"
++             "9g ^E  Top%21J  Jump to entry/offset\n"
++             "9G ^N  End%20^J  Toggle auto-advance on open\n"
+             "8B (,)  Book(mark)%11b ^/  Select bookmark\n"
+               "a1-4  Context%11(Sh)Tab  Cycle/new context\n"
+           "62Esc ^Q  Quit%20q  Quit context\n"
+                "b^G  QuitCD%18Q  Pick/err, quit\n"
        "0\n"
        "1FILTER & PROMPT\n"
--                "c/  Filter%-17c^N  Toggle type-to-nav\n"
-+                "c/  Filter%-17c^M  Toggle type-to-nav\n"
-               "aEsc  Exit prompt%-12c^L  Toggle last filter\n"
-                 "c.  Toggle hidden%-5cAlt+Esc  Unfilter, quit context\n"
+-                "c/  Filter%17^N  Toggle type-to-nav\n"
++                "c/  Filter%17^M  Toggle type-to-nav\n"
+               "aEsc  Exit prompt%12^L  Toggle last filter\n"
+                 "c.  Toggle hidden%05Alt+Esc  Unfilter, quit context\n"
        "0\n"
        "1FILES\n"
--             "9o ^O  Open with%-15cn  Create new/link\n"
-+             "9o ^O  Open with%-15cc  Create new/link\n"
-              "9f ^F  File stats%-14cd  Detail mode toggle\n"
-                "b^R  Rename/dup%-14cr  Batch rename\n"
--                "cz  Archive%-17ce  Edit file\n"
-+                "cz  Archive%-17cy  Edit file\n"
-                 "c*  Toggle exe%-14c>  Export list\n"
-           "6Space +  (Un)select%-12cm-m  Select range/clear\n"
-                 "ca  Select all%-14cA  Invert sel\n"
-              "9p ^P  Copy here%-12cw ^W  Cp/mv sel as\n"
--             "9v ^V  Move here%-15cE  Edit sel list\n"
-+             "9v ^V  Move here%-15cl  Edit sel list\n"
-              "9x ^X  Delete%-18cS  Listed sel size\n"
+-             "9o ^O  Open with%15n  Create new/link\n"
++             "9o ^O  Open with%15c  Create new/link\n"
+              "9f ^F  File stats%14d  Detail mode toggle\n"
+                "b^R  Rename/dup%14r  Batch rename\n"
+-                "cz  Archive%17e  Edit file\n"
++                "cz  Archive%17y  Edit file\n"
+                 "c*  Toggle exe%14>  Export list\n"
+           "6Space +  (Un)select%12m-m  Select range/clear\n"
+                 "ca  Select all%14A  Invert sel\n"
+              "9p ^P  Copy here%12w ^W  Cp/mv sel as\n"
+-             "9v ^V  Move here%15E  Edit sel list\n"
++             "9v ^V  Move here%15l  Edit sel list\n"
+              "9x ^X  Delete%18S  Listed sel size\n"
                "aEsc  Send to FIFO\n"
        "0\n"
 diff --git a/src/nnn.h b/src/nnn.h