vis

commit 980ea0b8cd0c79919131645dff82c2ed7a5f577a
parent 02804ae6e1ba8907a9991e025344ddf23bfc3246
Author: Marc André Tanner <mat@brain-dump.org>
Date:   Mon, 14 Nov 2016 17:36:41 +0100

vis: move initial theme loading code to lua

Diffstat:
M
README.md
 | 
6
------
M
ui-curses.c
 | 
10
----------
M
vis.1
 | 
3
---
M
vis.lua
 | 
2
++

4 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/README.md b/README.md
@@ -480,12 +480,6 @@ highlighting. `VIS_PATH` defaults (in this order) to
 - `/usr/local/share/vis`
 - `/usr/share/vis`
 
-The environment variable `VIS_THEME` can be set to specify the
-theme used by `vis` e.g.
-
-    VIS_THEME=dark-16
-    export VIS_THEME
-
 ### Runtime Configurable Key Bindings
 
 Vis supports run time key bindings via the `:{un,}map{,-window}` set of
diff --git a/ui-curses.c b/ui-curses.c
@@ -1055,16 +1055,6 @@ static bool ui_init(Ui *ui, Vis *vis) {
 }
 
 static bool ui_start(Ui *ui) {
-	Vis *vis = ((UiCurses*)ui)->vis;
-	const char *theme = getenv("VIS_THEME");
-	if (theme && theme[0]) {
-		if (!vis_theme_load(vis, theme))
-			vis_info_show(vis, "Warning: failed to load theme `%s'", theme);
-	} else {
-		theme = COLORS <= 16 ? "default-16" : "default-256";
-		if (!vis_theme_load(vis, theme))
-			vis_info_show(vis, "Warning: failed to load theme `%s' set $VIS_PATH", theme);
-	}
 	return true;
 }
 
diff --git a/vis.1 b/vis.1
@@ -38,9 +38,6 @@ if unset
 .B  /usr/share/vis
 .RE
 .RE
-.TP
-.B VIS_THEME
-Override syntax highlighting theme to use.
 .SH HELP
 Type
 .B :help
diff --git a/vis.lua b/vis.lua
@@ -416,3 +416,5 @@ vis.events.win_status = function(win)
 	local right = ' ' .. table.concat(right_parts, " « ") .. ' '
 	win:status(left, right);
 end
+
+vis.events.theme_change((not vis.ui or vis.ui.colors <= 16) and "default-16" or "default-256")