From 1fed7e84a3d65c8fbfbb321b84236ccab7265d46 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 8 Sep 2020 10:19:19 +0000
Subject: [PATCH] Allow -N without a command to change or add a note to an
 existing key.

---
 cmd-bind-key.c | 42 ++++++++++++++++++++++--------------------
 key-bindings.c | 10 ++++++++++
 2 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/cmd-bind-key.c b/cmd-bind-key.c
index dcb56c06..b4e4167c 100644
--- a/cmd-bind-key.c
+++ b/cmd-bind-key.c
@@ -33,9 +33,9 @@ const struct cmd_entry cmd_bind_key_entry = {
 	.name = "bind-key",
 	.alias = "bind",
 
-	.args = { "nrN:T:", 2, -1 },
+	.args = { "nrN:T:", 1, -1 },
 	.usage = "[-nr] [-T key-table] [-N note] key "
-	         "command [arguments]",
+	         "[command [arguments]]",
 
 	.flags = CMD_AFTERHOOK,
 	.exec = cmd_bind_key_exec
@@ -46,7 +46,7 @@ cmd_bind_key_exec(struct cmd *self, struct cmdq_item *item)
 {
 	struct args		 *args = cmd_get_args(self);
 	key_code		  key;
-	const char		 *tablename, *note;
+	const char		 *tablename, *note = args_get(args, 'N');
 	struct cmd_parse_result	 *pr;
 	char			**argv = args->argv;
 	int			  argc = args->argc, repeat;
@@ -65,22 +65,24 @@ cmd_bind_key_exec(struct cmd *self, struct cmdq_item *item)
 		tablename = "prefix";
 	repeat = args_has(args, 'r');
 
-	if (argc == 2)
-		pr = cmd_parse_from_string(argv[1], NULL);
-	else
-		pr = cmd_parse_from_arguments(argc - 1, argv + 1, NULL);
-	switch (pr->status) {
-	case CMD_PARSE_EMPTY:
-		cmdq_error(item, "empty command");
-		return (CMD_RETURN_ERROR);
-	case CMD_PARSE_ERROR:
-		cmdq_error(item, "%s", pr->error);
-		free(pr->error);
-		return (CMD_RETURN_ERROR);
-	case CMD_PARSE_SUCCESS:
-		break;
-	}
-	note = args_get(args, 'N');
-	key_bindings_add(tablename, key, note, repeat, pr->cmdlist);
+	if (argc != 1) {
+		if (argc == 2)
+			pr = cmd_parse_from_string(argv[1], NULL);
+		else
+			pr = cmd_parse_from_arguments(argc - 1, argv + 1, NULL);
+		switch (pr->status) {
+		case CMD_PARSE_EMPTY:
+			cmdq_error(item, "empty command");
+			return (CMD_RETURN_ERROR);
+		case CMD_PARSE_ERROR:
+			cmdq_error(item, "%s", pr->error);
+			free(pr->error);
+			return (CMD_RETURN_ERROR);
+		case CMD_PARSE_SUCCESS:
+			break;
+		}
+		key_bindings_add(tablename, key, note, repeat, pr->cmdlist);
+	} else
+		key_bindings_add(tablename, key, note, repeat, NULL);
 	return (CMD_RETURN_NORMAL);
 }
diff --git a/key-bindings.c b/key-bindings.c
index f11bb430..63d4bb26 100644
--- a/key-bindings.c
+++ b/key-bindings.c
@@ -191,6 +191,16 @@ key_bindings_add(const char *name, key_code key, const char *note, int repeat,
 	table = key_bindings_get_table(name, 1);
 
 	bd = key_bindings_get(table, key & ~KEYC_MASK_FLAGS);
+	if (cmdlist == NULL) {
+		if (bd != NULL) {
+			free((void *)bd->note);
+			if (note != NULL)
+				bd->note = xstrdup(note);
+			else
+				bd->note = NULL;
+		}
+		return;
+	}
 	if (bd != NULL) {
 		RB_REMOVE(key_bindings, &table->key_bindings, bd);
 		key_bindings_free(bd);