From 32a2caa692ee2e2b26d77d00b60166fba87667fb Mon Sep 17 00:00:00 2001
From: ryenus <ryenus@gmail.com>
Date: Thu, 8 Oct 2020 00:36:20 +0800
Subject: [PATCH] use 'w' for command wrapping as 'M' is already used

since 'M' is already used for sort-by-memory, as with:

    keys['M'] = actionSortByMemory;

reorder help info about shortcut keys
---
 Action.c  | 4 ++--
 htop.1.in | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Action.c b/Action.c
index 106fbb03..4ea6fdfb 100644
--- a/Action.c
+++ b/Action.c
@@ -423,8 +423,8 @@ static const struct { const char* key; const char* info; } helpRight[] = {
    { .key = "      e: ", .info = "show process environment" },
    { .key = "      i: ", .info = "set IO priority" },
    { .key = "      l: ", .info = "list open files with lsof" },
-   { .key = "      M: ", .info = "show process command in multiple lines" },
    { .key = "      s: ", .info = "trace syscalls with strace" },
+   { .key = "      w: ", .info = "wrap process command in multiple lines" },
    { .key = " F2 C S: ", .info = "setup" },
    { .key = "   F1 h: ", .info = "show this help screen" },
    { .key = "  F10 q: ", .info = "quit" },
@@ -595,5 +595,5 @@ void Action_setBindings(Htop_Action* keys) {
    keys['U'] = actionUntagAll;
    keys['c'] = actionTagAllChildren;
    keys['e'] = actionShowEnvScreen;
-   keys['M'] = actionShowCommandScreen;
+   keys['w'] = actionShowCommandScreen;
 }
diff --git a/htop.1.in b/htop.1.in
index 48e5cee5..cd5562b6 100644
--- a/htop.1.in
+++ b/htop.1.in
@@ -119,8 +119,9 @@ update of system calls issued by the process.
 Display open files for a process: if lsof(1) is installed, pressing this key
 will display the list of file descriptors opened by the process.
 .TP
-.B M
-Display the command line of the highlighted process in multiple lines.
+.B w
+Display the command line of the selected process in a separate screen, wrapped
+onto multiple lines as needed.
 .TP
 .B F1, h, ?
 Go to the help screen