diff options
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | 675-non-block_subproc.patch | 6 | ||||
| -rw-r--r-- | 977-makefile-multiple-targets.patch | 22 | ||||
| -rw-r--r-- | no-EOL-to-wl-clipboard.patch | 16 | ||||
| -rw-r--r-- | vis.spec | 3 |
5 files changed, 10 insertions, 41 deletions
@@ -1,2 +1,6 @@ .osc build.specials.obscpio +series +*.obscpio +vis/ +vis-test/ diff --git a/675-non-block_subproc.patch b/675-non-block_subproc.patch index 323e726..ed83123 100644 --- a/675-non-block_subproc.patch +++ b/675-non-block_subproc.patch @@ -70,7 +70,7 @@ #else -@@ -1368,6 +1379,47 @@ static int redraw(lua_State *L) { +@@ -1372,6 +1383,47 @@ static int redraw(lua_State *L) { return 0; } /*** @@ -118,7 +118,7 @@ * Currently active window. * @tfield Window win * @see windows -@@ -1524,6 +1576,7 @@ static const struct luaL_Reg vis_lua[] = +@@ -1528,6 +1580,7 @@ static const struct luaL_Reg vis_lua[] = { "exit", exit_func }, { "pipe", pipe_func }, { "redraw", redraw }, @@ -126,7 +126,7 @@ { "__index", vis_index }, { "__newindex", vis_newindex }, { NULL, NULL }, -@@ -3135,5 +3188,34 @@ void vis_lua_term_csi(Vis *vis, const lo +@@ -3139,5 +3192,34 @@ void vis_lua_term_csi(Vis *vis, const lo } lua_pop(L, 1); } diff --git a/977-makefile-multiple-targets.patch b/977-makefile-multiple-targets.patch deleted file mode 100644 index 73f43b8..0000000 --- a/977-makefile-multiple-targets.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 880acf5d42d1844a10fa3397961a4e02700ad4af Mon Sep 17 00:00:00 2001 -From: Aki <please@ignore.pl> -Date: Mon, 16 Aug 2021 22:24:18 +0200 -Subject: [PATCH 1/2] Makefile lexer now supports multiple targets in single - definition - ---- - lua/lexers/makefile.lua | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/lua/lexers/makefile.lua -+++ b/lua/lexers/makefile.lua -@@ -72,7 +72,8 @@ local special_target = token(l.CONSTANT, - '.SILENT', '.EXPORT_ALL_VARIABLES', '.NOTPARALLEL', '.ONESHELL', '.POSIX' - }, '.')) - local normal_target = token('target', (l.any - l.space - S(':#='))^1) --local target = l.starts_line((special_target + normal_target) * ws^0 * -+local target_list = normal_target * (ws * normal_target)^0 -+local target = l.starts_line((special_target + target_list) * ws^0 * - #(':' * -P('='))) - - -- Identifiers. diff --git a/no-EOL-to-wl-clipboard.patch b/no-EOL-to-wl-clipboard.patch index 91a6c6c..9db46d7 100644 --- a/no-EOL-to-wl-clipboard.patch +++ b/no-EOL-to-wl-clipboard.patch @@ -34,22 +34,12 @@ Best, Matěj
---
- vis-clipboard | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) + vis-clipboard | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) --- a/vis-clipboard +++ b/vis-clipboard -@@ -81,17 +81,17 @@ vc_paste() { - - vc_wlclipboard_copy() { - if [ "$sel" = "primary" ]; then -- wl-copy --primary -t TEXT -+ wl-copy --trim-newline --primary -t TEXT - else -- wl-copy -t TEXT -+ wl-copy --trim-newline -t TEXT - fi - } +@@ -89,9 +89,9 @@ vc_wlclipboard_copy() { vc_wlclipboard_paste() { if [ "$sel" = "primary" ]; then @@ -46,9 +46,6 @@ Patch4: 617-vis-highlight.patch # PATCH-FEATURE-UPSTREAM 959-flexible-insert-completion.patch gh#martanne/vis#959 # allow changes for https://github.com/jpaulogg/vis-ins-completion/tree/flex-completion Patch5: 959-flexible-insert-completion.patch -# PATCH-FEATURE-UPSTREAM 977-makefile-multiple-targets.patch gh#martanne/vis#977 -# lexers/makefile: Support multiple targets in a single definition -Patch6: 977-makefile-multiple-targets.patch # PATCH-FIX-UPSTREAM 558-gf_reimplementation.patch gh#martanne/vis#558 mcepl@suse.com # Implementation of the gf command, v2 # This patch seems to ignite gh#martanne/vis#827 again. |