Switch X and ^X key functionality

diff --git a/README.md b/README.md
index 11646fd0f9e9198259fe947dfbac355db356ae71..82c7832b3207fabe9e5a4a115f1abb83d5aa00db 100644 (file)
--- a/README.md
+++ b/README.md
@@ -228,8 +228,8 @@ Press <kbd>?</kbd> in `nnn` to see the list anytime.
              ^R  Rename entry          r  Open dir in vidir
              ^Y  Toggle selection      y  List selection
           ⎵, ^K  Copy entry path      ^T  Toggle path quote
-              P  Copy selection       ^X  Delete selection
-              V  Move selection        X  Delete entry
+              P  Copy selection        X  Delete selection
+              V  Move selection       ^X  Delete entry
               f  Archive entry         F  List archive
              ^F  Extract archive    m, M  Brief/full media info
               e  Edit in EDITOR        p  Open in PAGER

diff --git a/nnn.1 b/nnn.1
index 19aa7d5da872261a38a1d5595e6ea30098519914..d2c29a9090d03c8d4126881c3ed70c6f1e93249a 100644 (file)
--- a/nnn.1
+++ b/nnn.1
@@ -108,9 +108,9 @@ Toggle path quote
 Copy files from selection
 .It Ic V
 Move files from selection
-.It Ic ^X
-Delete files from selection
 .It Ic X
+Delete files from selection
+.It Ic ^X
 Delete entry
 .It Ic f
 Archive entry

diff --git a/src/nnn.c b/src/nnn.c
index 5b226b05a10918072b5c580d75887352290ed387..6e9cd9c0a4bb9e0b10089455e896f4aa5e12a5a5 100644 (file)
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -1975,8 +1975,8 @@ static int show_help(char *path)
             "d^R  Rename entry          r  Open dir in vidir\n"
             "d^Y  Toggle selection      y  List selection\n"
          "a⎵, ^K  Copy entry path      ^T  Toggle path quote\n"
-             "eP  Copy selection       ^X  Delete selection\n"
-             "eV  Move selection        X  Delete entry\n"
+             "eP  Copy selection        X  Delete selection\n"
+             "eV  Move selection       ^X  Delete entry\n"
              "ef  Archive entry         F  List archive\n"
             "d^F  Extract archive    m, M  Brief/full media info\n"
              "ee  Edit in EDITOR        p  Open in PAGER\n"

diff --git a/src/nnn.h b/src/nnn.h
index f001d9bcbe825f650c9693b63a1fb0bfb5ecbf0e..d4e0506d8da4c753ecb1d0742faf11e0fc4d272c 100644 (file)
--- a/src/nnn.h
+++ b/src/nnn.h
@@ -202,9 +202,9 @@ static struct key bindings[] = {
        /* Move from copy buffer */
        { 'V',            SEL_MV,        "",     "" },
        /* Delete from copy buffer */
-       { CONTROL('X'),   SEL_RMMUL,     "",     "" },
+       { 'X',   SEL_RMMUL,     "",     "" },
        /* Delete currently selected */
-       { 'X',            SEL_RM,        "",     "" },
+       { CONTROL('X'),   SEL_RM,        "",     "" },
        /* Toggle quote on while copy */
        { CONTROL('T'),   SEL_QUOTE,     "",     "" },
        /* Open in a custom application */