Merging upstream version 3.4.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 4 insertions, 11 deletions

diff --git a/options.c b/options.c
index f9cf2af..fef5637 100644
--- a/options.c
+++ b/options.c
@@ -1106,7 +1106,6 @@ options_push_changes(const char *name)
 	struct session		*s;
 	struct window		*w;
 	struct window_pane	*wp;
-	int			 c;
 
 	log_debug("%s: %s", __func__, name);
 
@@ -1119,18 +1118,12 @@ options_push_changes(const char *name)
 		}
 	}
 	if (strcmp(name, "cursor-colour") == 0) {
-		RB_FOREACH(wp, window_pane_tree, &all_window_panes) {
-			c = options_get_number(wp->options, name);
-			wp->screen->default_ccolour = c;
-		}
+		RB_FOREACH(wp, window_pane_tree, &all_window_panes)
+			window_pane_default_cursor(wp);
 	}
 	if (strcmp(name, "cursor-style") == 0) {
-		RB_FOREACH(wp, window_pane_tree, &all_window_panes) {
-			wp->screen->default_mode = 0;
-			screen_set_cursor_style(options_get_number(wp->options,
-			    name), &wp->screen->default_cstyle,
-			    &wp->screen->default_mode);
-		}
+		RB_FOREACH(wp, window_pane_tree, &all_window_panes)
+			window_pane_default_cursor(wp);
 	}
 	if (strcmp(name, "fill-character") == 0) {
 		RB_FOREACH(w, windows, &windows)