summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatěj Cepl <mcepl@cepl.eu>2022-07-11 18:32:19 +0200
committerMatěj Cepl <mcepl@cepl.eu>2022-07-11 18:32:19 +0200
commit7491bbf37e79c6a85ee3ce8eb6396c6f5acdabd1 (patch)
tree08290996f75221cb469374dcc53eeaa8ff3edcf0
parent9dd2b1bf2c87cf3f16aec07fb596daf1881458c4 (diff)
downloadvis-pkg-7491bbf37e79c6a85ee3ce8eb6396c6f5acdabd1.tar.gz
Rebase on the scintillua branch
-rw-r--r--558-gf_reimplementation.patch2
-rw-r--r--vis.changes5
-rw-r--r--vis.spec2
3 files changed, 7 insertions, 2 deletions
diff --git a/558-gf_reimplementation.patch b/558-gf_reimplementation.patch
index 69214f3..a2e8658 100644
--- a/558-gf_reimplementation.patch
+++ b/558-gf_reimplementation.patch
@@ -55,7 +55,7 @@ opened the file in the same window with `gf` and in a new one with
+vis:map(vis.modes.NORMAL, "<C-w>gf", "gf")
--- a/lua/vis-std.lua
+++ b/lua/vis-std.lua
-@@ -144,3 +144,5 @@ require('plugins/digraph')
+@@ -165,3 +165,5 @@ require('plugins/digraph')
require('plugins/number-inc-dec')
require('plugins/complete-word')
require('plugins/complete-filename')
diff --git a/vis.changes b/vis.changes
index 240ed2b..cf0e7fd 100644
--- a/vis.changes
+++ b/vis.changes
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Mon Jul 11 16:31:34 UTC 2022 - Matej Cepl <mcepl@suse.com>
+
+- Rebase on the scintillua branch.
+
+-------------------------------------------------------------------
Sun May 29 18:00:53 UTC 2022 - mcepl@cepl.eu
- Update to version 0.7+git.1653832963.0cc684f:
diff --git a/vis.spec b/vis.spec
index 39a7de7..26ec746 100644
--- a/vis.spec
+++ b/vis.spec
@@ -24,7 +24,7 @@ Summary: An editor combining the strengths of both vi(m) and sam
License: ISC
Group: Productivity/Text/Editors
URL: https://github.com/martanne/vis
-# ###!RemoteAssetUrl: git+https://github.com/martanne/vis.git
+# ###RemoteAssetUrl: git+https://github.com/martanne/vis.git
#!RemoteAssetUrl: git+https://github.com/mcepl/vis.git#scintillua
#!RemoteAssetUrl: git+https://github.com/martanne/vis-test.git#v0.5
Source99: vis-rpmlintrc