aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc André Tanner <mat@brain-dump.org>2017-06-27 21:00:32 +0200
committerMarc André Tanner <mat@brain-dump.org>2017-06-27 21:00:32 +0200
commit477fee9285f800b749ed4c0a7a0a6b1abdd66e39 (patch)
tree332e8db55aba478c12305166252b2b85c7ad3f99
parent431dea6871f88766e66ccaba5775303121a514ed (diff)
downloadvis-477fee9285f800b749ed4c0a7a0a6b1abdd66e39.tar.gz
vis-477fee9285f800b749ed4c0a7a0a6b1abdd66e39.tar.xz
vis: properly set initial window ui options
This should keep the EOF markers visible when another option is enabled. The whole UI option handling is a bit of a mess. In the longterm more of the drawing code should be moved into Lua.
-rw-r--r--view.c2
-rw-r--r--vis.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/view.c b/view.c
index 2de4142..4a3e18c 100644
--- a/view.c
+++ b/view.c
@@ -510,7 +510,7 @@ View *view_new(Text *text) {
.data = " ",
};
view->tabwidth = 8;
- view_options_set(view, UI_OPTION_SYMBOL_EOF);
+ view_options_set(view, 0);
if (!view_resize(view, 1, 1)) {
view_free(view);
diff --git a/vis.c b/vis.c
index caaf31a..e89fdf2 100644
--- a/vis.c
+++ b/vis.c
@@ -468,6 +468,7 @@ Win *window_new_file(Vis *vis, File *file, enum UiOption options) {
return NULL;
}
file->refcount++;
+ view_options_set(win->view, view_options_get(win->view));
view_tabwidth_set(win->view, vis->tabwidth);
if (vis->windows)
@@ -574,7 +575,7 @@ bool vis_window_new(Vis *vis, const char *filename) {
File *file = file_new(vis, filename);
if (!file)
return false;
- Win *win = window_new_file(vis, file, UI_OPTION_STATUSBAR);
+ Win *win = window_new_file(vis, file, UI_OPTION_STATUSBAR|UI_OPTION_SYMBOL_EOF);
if (!win) {
file_free(vis, file);
return false;