vis: Update to latest git

6 files changed, 161 insertions, 212 deletions

diff --git a/extra/vis/gen.rc b/extra/vis/gen.rc
index c18adf4a..429d2b04 100644
--- a/extra/vis/gen.rc
+++ b/extra/vis/gen.rc
@@ -1,4 +1,4 @@
-version=v0.2-476-gca86834
+version=v0.2-539-g37d98f3
 cflags\
 	'-std=c99' \
 	-D 'CONFIG_LUA=1' \
@@ -39,141 +39,149 @@ file bin/vis-menu '$outdir'/vis-menu 755
 file bin/vis-open '$srcdir'/vis-open 755
 
 for(f in vis.1 vis-menu.1 vis-open.1) {
-	build '$outdir'/$f sed '$srcdir'/$f ; with\
+	build '$outdir'/$f sed '$srcdir'/man/$f ; with\
 		expr s,VERSION,$version,
 	file share/man/man1/$f '$outdir'/$f 644
 }
 
-file share/vis/vis.lua '$srcdir'/vis.lua 644
-file share/vis/visrc.lua '$srcdir'/visrc.lua 644
-
-# <cd src/lexers && printf '\t%s\\\n' *.lua | sort
-lexers=lexers/^(\
-	actionscript.lua\
-	ada.lua\
-	ansi_c.lua\
-	antlr.lua\
-	apdl.lua\
-	apl.lua\
-	applescript.lua\
-	asm.lua\
-	asp.lua\
-	autoit.lua\
-	awk.lua\
-	bash.lua\
-	batch.lua\
-	bibtex.lua\
-	boo.lua\
-	caml.lua\
-	chuck.lua\
-	cmake.lua\
-	coffeescript.lua\
-	container.lua\
-	context.lua\
-	cpp.lua\
-	crystal.lua\
-	csharp.lua\
-	css.lua\
-	cuda.lua\
-	dart.lua\
-	desktop.lua\
-	diff.lua\
-	django.lua\
-	dmd.lua\
-	dockerfile.lua\
-	dot.lua\
-	dsv.lua\
-	eiffel.lua\
-	elixir.lua\
-	erlang.lua\
-	faust.lua\
-	fish.lua\
-	forth.lua\
-	fortran.lua\
-	fsharp.lua\
-	fstab.lua\
-	gap.lua\
-	gettext.lua\
-	gherkin.lua\
-	glsl.lua\
-	gnuplot.lua\
-	go.lua\
-	groovy.lua\
-	gtkrc.lua\
-	haskell.lua\
-	html.lua\
-	icon.lua\
-	idl.lua\
-	inform.lua\
-	ini.lua\
-	io_lang.lua\
-	java.lua\
-	javascript.lua\
-	json.lua\
-	jsp.lua\
-	latex.lua\
-	ledger.lua\
-	less.lua\
+# <cd src/lua/lexers && printf '\t%s\\\n' *.lua | sort
+lexers=(\
 	lexer.lua\
-	lilypond.lua\
-	lisp.lua\
-	litcoffee.lua\
-	lua.lua\
-	makefile.lua\
-	man.lua\
-	markdown.lua\
-	matlab.lua\
-	moonscript.lua\
-	nemerle.lua\
-	networkd.lua\
-	nim.lua\
-	nsis.lua\
-	null.lua\
-	objective_c.lua\
-	pascal.lua\
-	perl.lua\
-	php.lua\
-	pico8.lua\
-	pike.lua\
-	pkgbuild.lua\
-	powershell.lua\
-	prolog.lua\
-	props.lua\
-	protobuf.lua\
-	ps.lua\
-	pure.lua\
-	python.lua\
-	rails.lua\
-	rebol.lua\
-	rest.lua\
-	rexx.lua\
-	rhtml.lua\
-	rstats.lua\
-	ruby.lua\
-	rust.lua\
-	sass.lua\
-	scala.lua\
-	scheme.lua\
-	smalltalk.lua\
-	snobol4.lua\
-	sql.lua\
-	systemd.lua\
-	taskpaper.lua\
-	tcl.lua\
-	tex.lua\
-	texinfo.lua\
-	text.lua\
-	toml.lua\
-	vala.lua\
-	vb.lua\
-	vbscript.lua\
-	vcard.lua\
-	verilog.lua\
-	vhdl.lua\
-	wsf.lua\
-	xml.lua\
-	xtend.lua\
-	yaml.lua\
+	vis-std.lua\
+	vis.lua\
+	visrc.lua\
+	plugins/^(\
+		filetype.lua\
+		textobject-lexer.lua\
+	)\
+	lexers/^(\
+		actionscript.lua\
+		ada.lua\
+		ansi_c.lua\
+		antlr.lua\
+		apdl.lua\
+		apl.lua\
+		applescript.lua\
+		asm.lua\
+		asp.lua\
+		autoit.lua\
+		awk.lua\
+		bash.lua\
+		batch.lua\
+		bibtex.lua\
+		boo.lua\
+		caml.lua\
+		chuck.lua\
+		cmake.lua\
+		coffeescript.lua\
+		container.lua\
+		context.lua\
+		cpp.lua\
+		crystal.lua\
+		csharp.lua\
+		css.lua\
+		cuda.lua\
+		dart.lua\
+		desktop.lua\
+		diff.lua\
+		django.lua\
+		dmd.lua\
+		dockerfile.lua\
+		dot.lua\
+		dsv.lua\
+		eiffel.lua\
+		elixir.lua\
+		erlang.lua\
+		faust.lua\
+		fish.lua\
+		forth.lua\
+		fortran.lua\
+		fsharp.lua\
+		fstab.lua\
+		gap.lua\
+		gettext.lua\
+		gherkin.lua\
+		glsl.lua\
+		gnuplot.lua\
+		go.lua\
+		groovy.lua\
+		gtkrc.lua\
+		haskell.lua\
+		html.lua\
+		icon.lua\
+		idl.lua\
+		inform.lua\
+		ini.lua\
+		io_lang.lua\
+		java.lua\
+		javascript.lua\
+		json.lua\
+		jsp.lua\
+		latex.lua\
+		ledger.lua\
+		less.lua\
+		lexer.lua\
+		lilypond.lua\
+		lisp.lua\
+		litcoffee.lua\
+		lua.lua\
+		makefile.lua\
+		man.lua\
+		markdown.lua\
+		matlab.lua\
+		moonscript.lua\
+		nemerle.lua\
+		networkd.lua\
+		nim.lua\
+		nsis.lua\
+		null.lua\
+		objective_c.lua\
+		pascal.lua\
+		perl.lua\
+		php.lua\
+		pico8.lua\
+		pike.lua\
+		pkgbuild.lua\
+		powershell.lua\
+		prolog.lua\
+		props.lua\
+		protobuf.lua\
+		ps.lua\
+		pure.lua\
+		python.lua\
+		rails.lua\
+		rebol.lua\
+		rest.lua\
+		rexx.lua\
+		rhtml.lua\
+		rstats.lua\
+		ruby.lua\
+		rust.lua\
+		sass.lua\
+		scala.lua\
+		scheme.lua\
+		smalltalk.lua\
+		sml.lua\
+		snobol4.lua\
+		sql.lua\
+		systemd.lua\
+		taskpaper.lua\
+		tcl.lua\
+		tex.lua\
+		texinfo.lua\
+		text.lua\
+		toml.lua\
+		vala.lua\
+		vb.lua\
+		vbscript.lua\
+		vcard.lua\
+		verilog.lua\
+		vhdl.lua\
+		wsf.lua\
+		xml.lua\
+		xtend.lua\
+		yaml.lua\
+	)\
 	themes/^(\
 		dark-16.lua\
 		default-16.lua\
@@ -183,6 +191,6 @@ lexers=lexers/^(\
 	)\
 )
 for(f in $lexers)
-	file share/vis/$f '$srcdir'/$f 644
+	file share/vis/$f '$srcdir'/lua/$f 644
 
 fetch git
diff --git a/extra/vis/patch/0001-Allow-building-lpeg-statically.patch b/extra/vis/patch/0001-Allow-building-lpeg-statically.patch
index 133ce3bb..025bfb41 100644
--- a/extra/vis/patch/0001-Allow-building-lpeg-statically.patch
+++ b/extra/vis/patch/0001-Allow-building-lpeg-statically.patch
@@ -1,4 +1,4 @@
-From 6bfd92e10c366e804a14d793aa3df8e43baed550 Mon Sep 17 00:00:00 2001
+From 7a20eee4766219a030f8f581713d9a2b04d2e0ea Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Fri, 18 Nov 2016 21:35:52 -0800
 Subject: [PATCH] Allow building lpeg statically
@@ -9,10 +9,10 @@ Subject: [PATCH] Allow building lpeg statically
  2 files changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index e572442..92f501c 100644
+index 962fb7e..201c0c1 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -14,6 +14,7 @@ MANPREFIX ?= ${PREFIX}/man
+@@ -16,6 +16,7 @@ MANPREFIX ?= ${PREFIX}/man
  VERSION = $(shell git describe --always 2>/dev/null || echo "0.2")
  
  CONFIG_LUA ?= 1
@@ -20,7 +20,7 @@ index e572442..92f501c 100644
  CONFIG_ACL ?= 0
  CONFIG_SELINUX ?= 0
  
-@@ -25,7 +26,7 @@ CFLAGS_VIS = $(CFLAGS_AUTO) $(CFLAGS_TERMKEY) $(CFLAGS_CURSES) $(CFLAGS_ACL) \
+@@ -27,7 +28,7 @@ CFLAGS_VIS = $(CFLAGS_AUTO) $(CFLAGS_TERMKEY) $(CFLAGS_CURSES) $(CFLAGS_ACL) \
  	$(CFLAGS_SELINUX) $(CFLAGS_LUA) $(CFLAGS_STD)
  
  CFLAGS_VIS += -DVIS_PATH=\"${SHAREPREFIX}/vis\"
@@ -30,10 +30,10 @@ index e572442..92f501c 100644
  CFLAGS_VIS += -DCONFIG_ACL=${CONFIG_ACL}
  CFLAGS_VIS += ${CFLAGS_DEBUG}
 diff --git a/vis-lua.c b/vis-lua.c
-index 5b039ba..f6ed68e 100644
+index 29e94ef..83d2e52 100644
 --- a/vis-lua.c
 +++ b/vis-lua.c
-@@ -1404,6 +1404,15 @@ void vis_lua_init(Vis *vis) {
+@@ -1889,6 +1889,15 @@ void vis_lua_init(Vis *vis) {
  	vis->lua = L;
  	luaL_openlibs(L);
  
diff --git a/extra/vis/patch/0002-Set-default-theme-to-dark-16.patch b/extra/vis/patch/0002-Set-default-theme-to-dark-16.patch
index eeb358d6..254b5c5c 100644
--- a/extra/vis/patch/0002-Set-default-theme-to-dark-16.patch
+++ b/extra/vis/patch/0002-Set-default-theme-to-dark-16.patch
@@ -1,22 +1,25 @@
-From be040c6797873884126b25c78b72922ad9e13f4d Mon Sep 17 00:00:00 2001
+From af9461125ed8466c39da15ab9845fd95888da66e 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 dark-16
 
 ---
- vis.lua | 2 +-
+ lua/visrc.lua | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/vis.lua b/vis.lua
-index 0d14f8e..6c0e2a7 100644
---- a/vis.lua
-+++ b/vis.lua
-@@ -417,4 +417,4 @@ vis.events.win_status = function(win)
- 	win:status(left, right);
- end
+diff --git a/lua/visrc.lua b/lua/visrc.lua
+index 13bd7f7..e308fc3 100644
+--- a/lua/visrc.lua
++++ b/lua/visrc.lua
+@@ -5,7 +5,7 @@ require('plugins/textobject-lexer')
  
--vis.events.theme_change((not vis.ui or vis.ui.colors <= 16) and "default-16" or "default-256")
-+vis.events.theme_change("dark-16")
+ vis.events.subscribe(vis.events.INIT, function()
+ 	-- Your global configuration options
+-	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.WIN_OPEN, function(win)
 -- 
 2.10.2
 
diff --git a/extra/vis/patch/0003-Set-dates-in-man-pages.patch b/extra/vis/patch/0003-Set-dates-in-man-pages.patch
deleted file mode 100644
index 918ca1a6..00000000
--- a/extra/vis/patch/0003-Set-dates-in-man-pages.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 2b9a9abc6abca8973e5f9ee70a2dd0f329eed840 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Fri, 18 Nov 2016 23:31:52 -0800
-Subject: [PATCH] Set dates in man pages
-
----
- Makefile        | 6 +++---
- vis-clipboard.1 | 2 +-
- vis-menu.1      | 2 +-
- vis-open.1      | 2 +-
- 4 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 92f501c..68d6e08 100644
---- a/Makefile
-+++ b/Makefile
-@@ -101,9 +101,9 @@ install: vis vis-menu
- 	@echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
- 	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
- 	@sed -e "s/VERSION/${VERSION}/g" < vis.1 > ${DESTDIR}${MANPREFIX}/man1/vis.1
--	@sed -e "s/VERSION/${VERSION}/g" -e "s/MONTH DAY, YEAR/$$(date +'%B %e, %Y')/g" < vis-menu.1 > ${DESTDIR}${MANPREFIX}/man1/vis-menu.1
--	@sed -e "s/VERSION/${VERSION}/g" -e "s/MONTH DAY, YEAR/$$(date +'%B %e, %Y')/g" < vis-clipboard.1 > ${DESTDIR}${MANPREFIX}/man1/vis-clipboard.1
--	@sed -e "s/VERSION/${VERSION}/g" -e "s/MONTH DAY, YEAR/$$(date +'%B %e, %Y')/g" < vis-open.1 > ${DESTDIR}${MANPREFIX}/man1/vis-open.1
-+	@sed -e "s/VERSION/${VERSION}/g" < vis-menu.1 > ${DESTDIR}${MANPREFIX}/man1/vis-menu.1
-+	@sed -e "s/VERSION/${VERSION}/g" < vis-clipboard.1 > ${DESTDIR}${MANPREFIX}/man1/vis-clipboard.1
-+	@sed -e "s/VERSION/${VERSION}/g" < vis-open.1 > ${DESTDIR}${MANPREFIX}/man1/vis-open.1
- 	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/vis.1
- 	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/vis-menu.1
- 	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/vis-clipboard.1
-diff --git a/vis-clipboard.1 b/vis-clipboard.1
-index e91023b..8d7c6e2 100644
---- a/vis-clipboard.1
-+++ b/vis-clipboard.1
-@@ -1,4 +1,4 @@
--.Dd MONTH DAY, YEAR
-+.Dd June 16, 2016
- .Os Vis VERSION
- .Dt VIS-CLIPBOARD 1
- 
-diff --git a/vis-menu.1 b/vis-menu.1
-index 00cb3da..84789ff 100644
---- a/vis-menu.1
-+++ b/vis-menu.1
-@@ -1,4 +1,4 @@
--.Dd MONTH DAY, YEAR
-+.Dd May 28, 2016
- .Os Vis VERSION
- .Dt VIS-MENU 1
- 
-diff --git a/vis-open.1 b/vis-open.1
-index 749ab8f..5f77a17 100644
---- a/vis-open.1
-+++ b/vis-open.1
-@@ -1,4 +1,4 @@
--.Dd MONTH DAY, YEAR
-+.Dd June 21, 2016
- .Os Vis VERSION
- .Dt VIS-OPEN 1
- 
--- 
-2.10.2
-
diff --git a/extra/vis/rev b/extra/vis/rev
index 0cfbf088..00750edc 100644
--- a/extra/vis/rev
+++ b/extra/vis/rev
@@ -1 +1 @@
-2
+3
diff --git a/extra/vis/src b/extra/vis/src
-Subproject ca86834bb9e1c4934436b1a672bbc18a381f0e0
+Subproject 37d98f3119d5d3a63492bf9683ec6a4d68cc1e2