diff --git a/tmux.1 b/tmux.1
index dcb27b2fb..0589830ca 100644
--- a/tmux.1
+++ b/tmux.1
@@ -3603,7 +3603,7 @@ The
 flag will create an empty pane and forward any output from stdin to it.
 For example:
 .Bd -literal -offset indent
-$ make 2>&1|tmux splitw \-dI &
+$ make 2>&1|tmux new\-pane \-dI &
 .Ed
 .Pp
 All other options have the same meaning as for the
diff --git a/window-customize.c b/window-customize.c
index a31acc8ba..3a74989e1 100644
--- a/window-customize.c
+++ b/window-customize.c
@@ -472,6 +472,7 @@ window_customize_build_keys(struct window_customize_modedata *data,
 			expanded = format_expand(ft, filter);
 			if (!format_true(expanded)) {
 				free(expanded);
+				bd = key_bindings_next(kt, bd);
 				continue;
 			}
 			free(expanded);
diff --git a/window.c b/window.c
index fe4047e96..9759d78a6 100644
--- a/window.c
+++ b/window.c
@@ -2165,6 +2165,15 @@ window_pane_status_get_range(struct window_pane *wp, u_int x, u_int y)
 	return (style_ranges_get_range(srs, x - wp->xoff - 2));
 }
 
+enum pane_lines
+window_get_pane_lines(struct window *w)
+{
+	struct options	*oo;
+
+	oo = w->options;
+	return (options_get_number(oo, "pane-border-lines"));
+}
+
 enum pane_lines
 window_pane_get_pane_lines(struct window_pane *wp)
 {
@@ -2177,15 +2186,6 @@ window_pane_get_pane_lines(struct window_pane *wp)
 	return (options_get_number(oo, "pane-border-lines"));
 }
 
-enum pane_lines
-window_get_pane_lines(struct window *w)
-{
-	struct options	*oo;
-
-	oo = w->options;
-	return (options_get_number(oo, "pane-border-lines"));
-}
-
 int
 window_get_pane_status(struct window *w)
 {