1 files changed, 12 insertions, 12 deletions

diff --git a/vis-cmds.c b/vis-cmds.c
index 382a7d7..4cfb3bd 100644
--- a/vis-cmds.c
+++ b/vis-cmds.c
@@ -271,43 +271,43 @@ static bool cmd_set(Vis *vis, Win *win, Command *cmd, const char *argv[], Select
 			[OPTION_SHOW_EOF] = UI_OPTION_SYMBOL_EOF,
 			[OPTION_STATUSBAR] = UI_OPTION_STATUSBAR,
 		};
-		int flags = UI_OPTIONS_GET(win->view.ui);
+		int flags = win->options;
 		if (arg.b || (toggle && !(flags & values[opt_index])))
 			flags |= values[opt_index];
 		else
 			flags &= ~values[opt_index];
-		view_options_set(&win->view, flags);
+		win_options_set(win, flags);
 		break;
 	}
 	case OPTION_NUMBER: {
-		enum UiOption opt = UI_OPTIONS_GET(win->view.ui);
+		enum UiOption opt = win->options;
 		if (arg.b || (toggle && !(opt & UI_OPTION_LINE_NUMBERS_ABSOLUTE))) {
 			opt &= ~UI_OPTION_LINE_NUMBERS_RELATIVE;
 			opt |=  UI_OPTION_LINE_NUMBERS_ABSOLUTE;
 		} else {
 			opt &= ~UI_OPTION_LINE_NUMBERS_ABSOLUTE;
 		}
-		view_options_set(&win->view, opt);
+		win_options_set(win, opt);
 		break;
 	}
 	case OPTION_NUMBER_RELATIVE: {
-		enum UiOption opt = UI_OPTIONS_GET(win->view.ui);
+		enum UiOption opt = win->options;
 		if (arg.b || (toggle && !(opt & UI_OPTION_LINE_NUMBERS_RELATIVE))) {
 			opt &= ~UI_OPTION_LINE_NUMBERS_ABSOLUTE;
 			opt |=  UI_OPTION_LINE_NUMBERS_RELATIVE;
 		} else {
 			opt &= ~UI_OPTION_LINE_NUMBERS_RELATIVE;
 		}
-		view_options_set(&win->view, opt);
+		win_options_set(win, opt);
 		break;
 	}
 	case OPTION_CURSOR_LINE: {
-		enum UiOption opt = UI_OPTIONS_GET(win->view.ui);
+		enum UiOption opt = win->options;
 		if (arg.b || (toggle && !(opt & UI_OPTION_CURSOR_LINE)))
 			opt |= UI_OPTION_CURSOR_LINE;
 		else
 			opt &= ~UI_OPTION_CURSOR_LINE;
-		view_options_set(&win->view, opt);
+		win_options_set(win, opt);
 		break;
 	}
 	case OPTION_COLOR_COLUMN:
@@ -540,26 +540,26 @@ static bool cmd_qall(Vis *vis, Win *win, Command *cmd, const char *argv[], Selec
 static bool cmd_split(Vis *vis, Win *win, Command *cmd, const char *argv[], Selection *sel, Filerange *range) {
 	if (!win)
 		return false;
-	enum UiOption options = UI_OPTIONS_GET(win->view.ui);
+	enum UiOption options = win->options;
 	ui_arrange(&vis->ui, UI_LAYOUT_HORIZONTAL);
 	if (!argv[1])
 		return vis_window_split(win);
 	bool ret = openfiles(vis, &argv[1]);
 	if (ret)
-		view_options_set(&vis->win->view, options);
+		win_options_set(vis->win, options);
 	return ret;
 }
 
 static bool cmd_vsplit(Vis *vis, Win *win, Command *cmd, const char *argv[], Selection *sel, Filerange *range) {
 	if (!win)
 		return false;
-	enum UiOption options = UI_OPTIONS_GET(win->view.ui);
+	enum UiOption options = win->options;
 	ui_arrange(&vis->ui, UI_LAYOUT_VERTICAL);
 	if (!argv[1])
 		return vis_window_split(win);
 	bool ret = openfiles(vis, &argv[1]);
 	if (ret)
-		view_options_set(&vis->win->view, options);
+		win_options_set(vis->win, options);
 	return ret;
 }