Remove keys ^, $

diff --git a/README.md b/README.md
index 6676e4e9fe44bfedf20e9ca5306a8659e40d7e99..e9148c24952c0f0ffb304039900f4070696841df 100644 (file)
--- a/README.md
+++ b/README.md
@@ -209,10 +209,10 @@ Press <kbd>?</kbd> in `nnn` to see the list anytime.
  NAVIGATION
        ↑, k, ^P  Up           PgUp, ^U  Scroll up
        ↓, j, ^N  Down         PgDn, ^D  Scroll down
- Home, g, ^, ^A  First entry         ~  Go HOME
-  End, G, $, ^E  Last entry          &  Start dir
- ←, Bksp, h, ^H  Parent dir          -  Last visited dir
-    →, ↵, l, ^M  Open file/dir       .  Toggle show hidden
+ ←, Bksp, h, ^H  Parent dir          ~  Go HOME
+    →, ↵, l, ^M  Open file/dir       &  Start dir
+    Home, g, ^A  First entry         -  Last visited dir
+     End, G, ^E  Last entry          .  Toggle show hidden
               /  Filter        Ins, ^T  Toggle nav-as-you-type
               b  Pin current dir    ^W  Go to pinned dir
         Tab, ^I  Next context        d  Toggle detail view

diff --git a/nnn.1 b/nnn.1
index 41127ad99b7557928c58995bca80a6cc9ccb0e9a..92f4ef234d7e945b67979392e080b462d58692df 100644 (file)
--- a/nnn.1
+++ b/nnn.1
@@ -26,9 +26,6 @@ opens the current working directory by default if
 is not specified.
 .Sh KEYBINDS
 .Pp
-.Nm
-supports both vi-like and emacs-like key bindings as listed below.
-.Pp
 NAVIGATION
 .Pp
 .Bl -tag -width "l, [Right], [Return] or C-mXXXX" -offset indent -compact
@@ -36,18 +33,18 @@ NAVIGATION
 Move to previous entry
 .It Ic [Down], j, ^N
 Move to next entry
+.It Ic [Left], [Backspace], h, ^H
+Go to parent directory
+.It Ic [Right], [Enter], l, ^M
+Open file or enter directory
 .It Ic [PgUp], ^U
 Scroll up half a page
 .It Ic [PgDn], ^D
 Scroll down half a page
-.It Ic [Home], g, ^, ^A
+.It Ic [Home], g, ^A
 Move to the first entry
-.It Ic [End], G, $, ^E
+.It Ic [End], G, ^E
 Move to the last entry
-.It Ic [Left], [Backspace], h, ^H
-Go to parent directory
-.It Ic [Right], [Enter], l, ^M
-Open file or enter directory
 .It Ic ~
 Change to the HOME directory
 .It Ic &

diff --git a/src/nnn.c b/src/nnn.c
index ff770c9693c47501c32ce0e9acc3fabb48982456..5062f160b6bd52dca911b02b70428a2990f1ef76 100644 (file)
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -2093,10 +2093,10 @@ static bool show_help(char *path)
 "1NAVIGATION\n"
       "7↑, k, ^P  Up           PgUp, ^U  Scroll up\n"
       "7↓, j, ^N  Down         PgDn, ^D  Scroll down\n"
-"1Home, g, ^, ^A  First entry         ~  Go HOME\n"
- "2End, G, $, ^E  Last entry          &  Start dir\n"
-"1←, Bksp, h, ^H  Parent dir          -  Last visited dir\n"
-   "4→, ↵, l, ^M  Open file/dir       .  Toggle show hidden\n"
+"1←, Bksp, h, ^H  Parent dir          ~  Go HOME\n"
+   "4→, ↵, l, ^M  Open file/dir       &  Start dir\n"
+   "4Home, g, ^A  First entry         -  Last visited dir\n"
+    "5End, G, ^E  Last entry          .  Toggle show hidden\n"
              "e/  Filter        Ins, ^T  Toggle nav-as-you-type\n"
              "eb  Pin current dir    ^W  Go to pinned dir\n"
        "8Tab, ^I  Next context        d  Toggle detail view\n"

diff --git a/src/nnn.h b/src/nnn.h
index c68d4d4278c5610c0c86c37de05196d29419bc30..71f5c3edec880d31d8510a92f064965740a31018 100644 (file)
--- a/src/nnn.h
+++ b/src/nnn.h
@@ -129,12 +129,10 @@ static struct key bindings[] = {
        { KEY_HOME,       SEL_HOME },
        { 'g',            SEL_HOME },
        { CONTROL('A'),   SEL_HOME },
-       { '^',            SEL_HOME },
        /* Last entry */
        { KEY_END,        SEL_END },
        { 'G',            SEL_END },
        { CONTROL('E'),   SEL_END },
-       { '$',            SEL_END },
        /* HOME */
        { '~',            SEL_CDHOME },
        /* Initial directory */