local/vis: upgrade to 20250119

Add patch from mcepl's orgmode changes.
Remove patch that is included  in upstream commits.

3 files changed, 127 insertions, 35 deletions

diff --git a/vis/0001-lua-fix-table-member-reference-in-set_syntax.patch b/vis/0001-lua-fix-table-member-reference-in-set_syntax.patch
deleted file mode 100644
index af1ba9c..0000000
--- a/vis/0001-lua-fix-table-member-reference-in-set_syntax.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f840bcaf95dea328b9edc76c68e27d42cf79330b Mon Sep 17 00:00:00 2001
-From: Florian Fischer <florian.fischer@muhq.space>
-Date: Thu, 14 Nov 2024 14:44:33 +0100
-Subject: [PATCH] lua: fix table member reference in set_syntax
-
-Reported-By: aimixsaka <aimixsaka@gmail.com>
----
- lua/vis.lua | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lua/vis.lua b/lua/vis.lua
-index d06bbaf..9ac41b0 100644
---- a/lua/vis.lua
-+++ b/lua/vis.lua
-@@ -288,7 +288,7 @@ vis.types.window.set_syntax = function(win, syntax)
- 		if type(style) == 'table' then
- 			local s = ''
- 			if style.attr then
--				s = string.format("%s,%s", s, attr)
-+				s = string.format("%s,%s", s, style.attr)
- 			elseif style.fore then
- 				s = string.format("%s,fore:%s", s, style.fore)
- 			elseif style.back then
--- 
-2.47.0
-
diff --git a/vis/APKBUILD b/vis/APKBUILD
index 73cb9e7..53fafcb 100644
--- a/vis/APKBUILD
+++ b/vis/APKBUILD
@@ -1,20 +1,20 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
 pkgname=vis
-pkgver=0.9_git20241025
-_commit=c0d083f4ca827d83c6b8beafd52a0ea95ece73da
-pkgrel=2
+pkgver=0.9_git20250119
+_commit=4970df09cea1e427b36469cc66340906cb5a0cb1
+pkgrel=1
 pkgdesc="Modern, legacy free, simple yet efficient vim-like editor"
 url="https://github.com/martanne/vis"
 arch="all"
 license="ISC"
 depends="!outils-vis lua5.3-lpeg"
 makedepends="acl-dev libtermkey-dev lua5.3-dev ncurses-dev tre-dev"
-checkdepends="luacheck vim"
+# added bash to checkdepends to fix one or two failing tests
+checkdepends="bash luacheck vim"
 subpackages="$pkgname-dbg $pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/martanne/vis/archive/$_commit.tar.gz
-	0001-lua-fix-table-member-reference-in-set_syntax.patch
-	"
+source="$pkgname-$_commit.tar.gz::https://github.com/martanne/vis/archive/$_commit.tar.gz
+	vis-org-mode.patch"
 builddir="$srcdir/vis-$_commit"
 
 build() {
@@ -36,6 +36,6 @@ package() {
 }
 
 sha512sums="
-1a1675d20e39206b54f4fadc6e86506f036f527ff91b5fe392f2b0aa787c49f00e0217e85ce851553259fa86bc07b27bcd6ebd1d253ee4974def04e5d1061f0e  vis-0.9_git20241025.tar.gz
-f38bd8dbad9fb0230a960aa0e6e9b9f1f6f10b414ed9736b1d931785c3ee2d8c4e46b03237cf41a511bb64fdd85628807a977391c8f5d9c09d323efaa6e453a4  0001-lua-fix-table-member-reference-in-set_syntax.patch
+43402cbaff471e31aecf7dabb5e4729d82900e9c76c5b54597de110d18334e9cd61d7f5a9d89654c29d529e40f960cd69389acddd86165bd6b2ee73923c860a2  vis-4970df09cea1e427b36469cc66340906cb5a0cb1.tar.gz
+baba37ab1e33d87b498b31e16d23baa7c3afb4d50d4829e7c2bf17148f62eb009e6190d902d0e71d103d644ffb91341469e3c1178f62b9e1b5c6ae0692ea94e5  vis-org-mode.patch
 "
diff --git a/vis/vis-org-mode.patch b/vis/vis-org-mode.patch
new file mode 100644
index 0000000..b0a8274
--- /dev/null
+++ b/vis/vis-org-mode.patch
@@ -0,0 +1,118 @@
+diff -Naur a/lua/lexers/lexer.lua b/lua/lexers/lexer.lua
+--- a/lua/lexers/lexer.lua	2025-01-23 15:41:23.483390473 -0500
++++ b/lua/lexers/lexer.lua	2025-01-23 15:44:58.590614820 -0500
+@@ -1684,6 +1684,7 @@
+ 		nsh = 'nsis', nsi = 'nsis', nsis = 'nsis', --
+ 		obs = 'objeck', --
+ 		m = 'objective_c', mm = 'objective_c', objc = 'objective_c', --
++		org = 'org', --
+ 		caml = 'caml', ml = 'caml', mli = 'caml', mll = 'caml', mly = 'caml', --
+ 		dpk = 'pascal', dpr = 'pascal', p = 'pascal', pas = 'pascal', --
+ 		al = 'perl', perl = 'perl', pl = 'perl', pm = 'perl', pod = 'perl', --
+diff -Naur a/lua/lexers/org.lua b/lua/lexers/org.lua
+--- a/lua/lexers/org.lua	1969-12-31 19:00:00.000000000 -0500
++++ b/lua/lexers/org.lua	2025-01-23 15:44:58.593948110 -0500
+@@ -0,0 +1,103 @@
++--[[ Textadept Org module -- Org agenda LPeg lexer
++Copyright (c) 2012 joten
++Copyright (c) 2025 Matěj Cepl (@mcepl everywhere)
++Released under the conditions described in the LICENSE file.
++--]]
++
++local lexer = lexer
++local word_match = lexer.word_match
++local P, R, S, V = lpeg.P, lpeg.R, lpeg.S, lpeg.V
++
++local lex = lexer.new(...)
++
++--[[Overview. Used examples.
++* Heading 1-5 (8)
++	TODO special color, bold
++	DONE special color, bold
++	[#priority]
++	:tag: bold
++<date> / [date] like heading 3, underlined
++	keywords: CLOSED: DEADLINE: SCHEDULED: like heading 3, not underlined
++| table | like heading 1
++[[link][description] ]
++formatting:
++	*bold*
++	/italic/
++	_underline_
++	+strike+
++--]]
++
++-- Font formats.
++lex:add_rule('bold', lex:tag('BOLD',      '*' * lexer.word * '*'))
++lex:add_rule('italic', lex:tag('ITALIC',    '/' * lexer.word * '/'))
++lex:add_rule('underline', lex:tag('UNDERLINE', '_' * lexer.alnum * '_'))
++
++-- ToDos.
++lex:add_rule('todo', lex:tag('TODO', lex:word_match('TODO')))
++lex:add_rule('done', lex:tag('DONE', lex:word_match('DONE')))
++lex:add_rule('wontfix', lex:tag('WONTFIX', lex:word_match('WONTFIX')))
++local agenda_tags = P('TODO') + 'DONE' + 'WONTFIX'
++
++-- DateTime.
++local DD =   lexer.digit * lexer.digit
++local date = DD * DD * '-' * DD * '-' * DD
++local time_range = (' ' * DD * ':' * DD)^0 * ('-' * DD * ':' * DD)^0
++local repeater =   (' +' * lexer.integer * S('dwmy'))^0
++local alarm =      (' -' * lexer.integer * S('dwmy'))^0
++local pattern_datetime1 = S('<[')^-1 * 'date' * 'wday' * time_range * repeater * alarm * S('>]')^-1
++local pattern_datetime2 = lexer.starts_line('weekday') * lexer.space^1 * DD * '. ' * 'month' * lexer.space^1 * DD * DD
++local datetime =   pattern_datetime1 + pattern_datetime2
++
++lex:add_rule('current_date', lex:tag('CURRENT_DATE', lexer.starts_line(lex:word_match('weekday')) * lexer.space^1 * DD * '. ' * lex:word_match('month') * lexer.space^1 * DD * DD * '|'))
++lex:add_rule('time', lex:tag(lexer.CLASS, DD * ':' * DD))
++lex:add_rule('week', lex:tag('UNDERLINE', lexer.starts_line('KW ' * DD * lexer.space^25) + lexer.starts_line('Wk ' * DD * lexer.space^25)))
++lex:add_rule('datetime', lex:tag(lexer.NUMBER, lex:word_match('datetime')))
++
++-- Heading patterns.
++local function h(n)
++	return lex:tag(string.format('%s.h%s', lexer.HEADING, n),
++		lexer.starts_line(P(string.rep('*', n)) * ' '))
++end
++lex:add_rule('header', h(6) + h(5) + h(4) + h(3) + h(2) + h(1))
++
++-- Links.
++local orgmode_link = '[[' * (lexer.nonnewline - ' ' - ']')^1 * ']' * ('[' * (lexer.nonnewline - ']')^1 * ']')^0 * ']'
++lex:add_rule('link', lex:tag(lexer.LINK, orgmode_link))
++
++-- Strings.
++lex:add_rule('string', lex:tag(lexer.STRING, P('L')^-1 * lexer.range('"')))
++
++-- Comments.
++local line_comment = lexer.starts_line(lexer.to_eol('# ')) 
++local block_comment = lexer.range(lexer.starts_line('#+BEGIN_COMMENT'),
++		lexer.starts_line('#+END_COMMENT'))
++lex:add_rule('comment', lex:tag(lexer.COMMENT, block_comment + line_comment))
++
++-- Word lists.
++lex:set_word_list('TODO', {'TODO', 'DELEGATED', 'WAITING'})
++
++lex:set_word_list('DONE', {'DONE'})
++
++lex:set_word_list('WONTFIX', {'WONTFIX', 'INVALID'})
++
++lex:set_word_list('wday', {
++	'Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa', 'So',
++	'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun',
++	'Po', 'Út', 'St', 'Čt', 'Pá', 'So', 'Ne'
++})
++
++lex:set_word_list('weekday', {
++	'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag', 'Sonntag',
++	'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday',
++	'Pondělí', 'Úterý', 'Středa', 'Čtvrtek', 'Pátek', 'Sobota', 'Neděle'
++})
++
++lex:set_word_list('month', {
++	'Januar', 'Februar', 'März', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember',
++	'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December',
++	'Leden', 'Únor', 'Březen', 'Duben', 'Květen', 'Červen', 'Červenec', 'Srpen', 'Září', 'Říjen', 'Listopad', 'Prosince'
++})
++
++lexer.property['scintillua.comment'] = '#'
++
++return lex