Merge branch 'obsd-master' into master

1 files changed, 8 insertions, 0 deletions

diff --git a/options.c b/options.c
index 4da1c408..865ab01f 100644
--- a/options.c
+++ b/options.c
@@ -1122,6 +1122,14 @@ options_push_changes(const char *name)
 			wp->screen->default_ccolour = c;
 		}
 	}
+	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);
+		}
+	}
 	if (strcmp(name, "key-table") == 0) {
 		TAILQ_FOREACH(loop, &clients, entry)
 			server_client_set_key_table(loop, NULL);