summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2016-12-21 00:35:05 -0800
committerMichael Forney <mforney@mforney.org>2016-12-21 20:09:51 -0800
commit91b2a0770e49b4ce8f5fbfb8a12613911c266398 (patch)
tree95b7efaea4bf4f5fac329dde1f8a7d81cbe1cfeb
parent2d73ad9b5b0e62b26002f73857d9f2c921246c1b (diff)
vis: Use symlinks instead of patch to change default theme
-rw-r--r--.gitmodules1
-rw-r--r--pkg/vis/gen.rc4
-rw-r--r--pkg/vis/patch/0001-Set-default-theme-to-default-16.patch25
-rw-r--r--pkg/vis/rev2
4 files changed, 3 insertions, 29 deletions
diff --git a/.gitmodules b/.gitmodules
index 1db71760..cb7c01a7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -195,7 +195,6 @@
[submodule "pkg/vis/src"]
path = pkg/vis/src
url = https://github.com/martanne/vis
- ignore = all
[submodule "pkg/wayland-protocols/src"]
path = pkg/wayland-protocols/src
url = https://anongit.freedesktop.org/git/wayland/wayland-protocols.git
diff --git a/pkg/vis/gen.rc b/pkg/vis/gen.rc
index 80749c60..75f06256 100644
--- a/pkg/vis/gen.rc
+++ b/pkg/vis/gen.rc
@@ -186,13 +186,13 @@ lexers=(\
)\
themes/^(\
dark-16.lua\
- default-16.lua\
- default-256.lua\
light-16.lua\
solarized.lua\
)\
)
for(f in $lexers)
file share/vis/$f '$srcdir'/lua/$f 644
+sym share/vis/themes/default-16.lua dark-16.lua
+sym share/vis/themes/default-256.lua dark-16.lua
fetch git
diff --git a/pkg/vis/patch/0001-Set-default-theme-to-default-16.patch b/pkg/vis/patch/0001-Set-default-theme-to-default-16.patch
deleted file mode 100644
index a47fd857..00000000
--- a/pkg/vis/patch/0001-Set-default-theme-to-default-16.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 96c37c8e8b2b3be1620033e44ead62f1c8c953cb Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Fri, 18 Nov 2016 21:53:25 -0800
-Subject: [PATCH] Set default theme to default-16
-
----
- lua/vis-std.lua | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lua/vis-std.lua b/lua/vis-std.lua
-index ff5469a..d3a8760 100644
---- a/lua/vis-std.lua
-+++ b/lua/vis-std.lua
-@@ -19,7 +19,7 @@ vis.events.subscribe(vis.events.INIT, function()
- vis.lexers = require('lexer')
- end
-
-- vis:command("set theme ".. (vis.ui.colors <= 16 and "default-16" or "default-256"))
-+ vis:command("set theme default-16")
- end)
-
- vis.events.subscribe(vis.events.THEME_CHANGE, function(name)
---
-2.11.0
-
diff --git a/pkg/vis/rev b/pkg/vis/rev
index 7ed6ff82..1e8b3149 100644
--- a/pkg/vis/rev
+++ b/pkg/vis/rev
@@ -1 +1 @@
-5
+6