===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-split-window.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- src/usr.bin/tmux/cmd-split-window.c	2019/04/28 20:05:50	1.94
+++ src/usr.bin/tmux/cmd-split-window.c	2019/05/03 20:44:24	1.95
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-split-window.c,v 1.94 2019/04/28 20:05:50 nicm Exp $ */
+/* $OpenBSD: cmd-split-window.c,v 1.95 2019/05/03 20:44:24 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -40,9 +40,10 @@
 	.name = "split-window",
 	.alias = "splitw",
 
-	.args = { "bc:de:fF:l:hp:Pt:v", 0, -1 },
-	.usage = "[-bdefhvP] [-c start-directory] [-e environment] [-F format] "
-		 "[-p percentage|-l size] " CMD_TARGET_PANE_USAGE " [command]",
+	.args = { "bc:de:fF:hIl:p:Pt:v", 0, -1 },
+	.usage = "[-bdefhIPv] [-c start-directory] [-e environment] "
+		 "[-F format] [-p percentage|-l size] " CMD_TARGET_PANE_USAGE
+		 " [command]",
 
 	.target = { 't', CMD_FIND_PANE, 0 },
 
@@ -63,7 +64,7 @@
 	enum layout_type	 type;
 	struct layout_cell	*lc;
 	struct cmd_find_state	 fs;
-	int			 size, percentage, flags;
+	int			 size, percentage, flags, input;
 	const char		*template, *add;
 	char			*cause, *cp;
 	struct args_value	*value;
@@ -94,12 +95,15 @@
 		size = -1;
 
 	server_unzoom_window(wp->window);
+	input = (args_has(args, 'I') && args->argc == 0);
 
 	flags = 0;
 	if (args_has(args, 'b'))
 		flags |= SPAWN_BEFORE;
 	if (args_has(args, 'f'))
 		flags |= SPAWN_FULLSIZE;
+	if (input || (args->argc == 1 && *args->argv[0] == '\0'))
+		flags |= SPAWN_EMPTY;
 
 	lc = layout_split_pane(wp, type, size, flags);
 	if (lc == NULL) {
@@ -134,10 +138,18 @@
 		sc.flags |= SPAWN_DETACHED;
 
 	if ((new_wp = spawn_pane(&sc, &cause)) == NULL) {
+		layout_close_pane(new_wp);
 		cmdq_error(item, "create pane failed: %s", cause);
 		free(cause);
 		return (CMD_RETURN_ERROR);
 	}
+	if (input && window_pane_start_input(new_wp, item, &cause) != 0) {
+		layout_close_pane(new_wp);
+		window_remove_pane(wp->window, new_wp);
+		cmdq_error(item, "%s", cause);
+		free(cause);
+		return (CMD_RETURN_ERROR);
+	}
 	if (!args_has(args, 'd'))
 		cmd_find_from_winlink_pane(current, wl, new_wp, 0);
 	server_redraw_window(wp->window);
@@ -155,5 +167,7 @@
 	cmdq_insert_hook(s, item, &fs, "after-split-window");
 
 	environ_free(sc.environ);
+	if (input)
+		return (CMD_RETURN_WAIT);
 	return (CMD_RETURN_NORMAL);
 }