From 526330bb8b48c0139c09c8a08410e72500977900 Mon Sep 17 00:00:00 2001
From: Arun Prakash Jana <engineerarun@gmail.com>
Date: Mon, 13 Jan 2020 21:09:40 +0530
Subject: Unify plugin keys

---
 src/nnn.c | 21 ++++++++++-----------
 src/nnn.h |  5 +----
 2 files changed, 11 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/nnn.c b/src/nnn.c
index 8a437b2..fb8a6d5 100644
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -3613,10 +3613,10 @@ static void show_help(const char *path)
 		  "cX  Delete sel%-13c^X  Delete entry\n"
 	       "9o ^T  Order toggle%-11c^Y  List, edit sel\n"
 		"1MISC\n"
-	       "9! ^]  Shell%-16c; ^F  Fire plugin\n"
-	          "c]  Cmd prompt%-13c^P  Pick plugin\n"
-		  "cs  Manage session%-10c=  Launch app\n"
-		  "cc  Connect remote%-10cu  Unmount\n"
+	       "9; ^P  Plugin%-18c=  Launch app\n"
+	       "9! ^]  Shell%-19c]  Cmd prompt\n"
+		  "cs  Manage session%-10cu  Unmount\n"
+		  "cc  Connect remote%-0c\n"
 	};
 
 	fd = create_tmp_file();
@@ -5477,7 +5477,6 @@ nochange:
 
 			goto begin;
 		}
-		case SEL_PLUGKEY: // fallthrough
 		case SEL_PLUGIN:
 			/* Check if directory is accessible */
 			if (!xdiraccess(plugindir)) {
@@ -5485,12 +5484,12 @@ nochange:
 				goto nochange;
 			}
 
-			if (sel == SEL_PLUGKEY) {
+			r = xstrlcpy(g_buf, messages[MSG_PLUGIN_KEYS], CMD_LEN_MAX);
+			printkeys(plug, g_buf + r - 1, PLUGIN_MAX);
+			printprompt(g_buf);
+			r = get_input(NULL);
+			if (r != '\r') {
 				endselection();
-				r = xstrlcpy(g_buf, messages[MSG_PLUGIN_KEYS], CMD_LEN_MAX);
-				printkeys(plug, g_buf + r - 1, PLUGIN_MAX);
-				printprompt(g_buf);
-				r = get_input(NULL);
 				tmp = get_kv_val(plug, NULL, r, PLUGIN_MAX, FALSE);
 				if (!tmp) {
 					printwait(messages[MSG_INVALID_KEY], &presel);
@@ -5517,7 +5516,7 @@ nochange:
 
 				if (ndents)
 					copycurname();
-			} else {
+			} else { /* 'Return/Enter' enters the plugin directory */
 				cfg.runplugin ^= 1;
 				if (!cfg.runplugin && rundir[0]) {
 					/*
diff --git a/src/nnn.h b/src/nnn.h
index b0e712b..f1cb550 100644
--- a/src/nnn.h
+++ b/src/nnn.h
@@ -85,7 +85,6 @@ enum action {
 	SEL_REMOTE,
 	SEL_UMOUNT,
 	SEL_HELP,
-	SEL_PLUGKEY,
 	SEL_PLUGIN,
 	SEL_SHELL,
 	SEL_LAUNCH,
@@ -217,10 +216,8 @@ static struct key bindings[] = {
 	{ 'u',            SEL_UMOUNT },
 	/* Show help */
 	{ '?',            SEL_HELP },
-	/* Plugin key */
-	{ ';',            SEL_PLUGKEY },
-	{ CONTROL('F'),   SEL_PLUGKEY },
 	/* Run a plugin */
+	{ ';',            SEL_PLUGIN },
 	{ CONTROL('P'),   SEL_PLUGIN },
 	/* Run command */
 	{ '!',            SEL_SHELL },
-- 
cgit v1.2.3-70-g09d2