===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-bind-key.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- src/usr.bin/tmux/cmd-bind-key.c	2021/08/21 17:25:32	1.41
+++ src/usr.bin/tmux/cmd-bind-key.c	2021/08/21 20:46:43	1.42
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-bind-key.c,v 1.41 2021/08/21 17:25:32 nicm Exp $ */
+/* $OpenBSD: cmd-bind-key.c,v 1.42 2021/08/21 20:46:43 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -50,6 +50,7 @@
 	struct cmd_parse_result	 *pr;
 	char			**argv;
 	int			  argc, repeat;
+	struct args_value	 *value;
 	u_int			  count = args_count(args);
 
 	key = key_string_lookup_string(args_string(args, 0));
@@ -66,24 +67,32 @@
 		tablename = "prefix";
 	repeat = args_has(args, 'r');
 
-	if (count != 1) {
-		if (count == 2)
-			pr = cmd_parse_from_string(args_string(args, 1), NULL);
-		else {
-			args_vector(args, &argc, &argv);
-			pr = cmd_parse_from_arguments(argc - 1, argv + 1, NULL);
-			cmd_free_argv(argc, argv);
-		}
-		switch (pr->status) {
-		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
+	if (count == 1) {
 		key_bindings_add(tablename, key, note, repeat, NULL);
+		return (CMD_RETURN_NORMAL);
+	}
+
+	value = args_value(args, 1);
+	if (count == 2 && value->type == ARGS_COMMANDS) {
+		key_bindings_add(tablename, key, note, repeat, value->cmdlist);
+		return (CMD_RETURN_NORMAL);
+	}
+
+	if (count == 2)
+		pr = cmd_parse_from_string(args_string(args, 1), NULL);
+	else {
+		args_vector(args, &argc, &argv);
+		pr = cmd_parse_from_arguments(argc - 1, argv + 1, NULL);
+		cmd_free_argv(argc, argv);
+	}
+	switch (pr->status) {
+	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);
 	return (CMD_RETURN_NORMAL);
 }