From 24f7df506af166b3b2af53636b48b48845e3eb63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= <mat@brain-dump.org>
Date: Thu, 23 Feb 2017 10:53:48 +0100
Subject: test: fix travis macOS test failures

The vim version installed on the Travis macOS VMs does
not seem to correctly handle ; when already on a matching
position. Move the affected test to test/vis.

Also fix white space related issues in sed invocation.
---
 vim/motions/till-right.in                         |  7 -------
 vim/motions/till-right.keys                       | 19 -------------------
 vis/motions/till-right.in                         |  7 +++++++
 vis/motions/till-right.keys                       | 19 +++++++++++++++++++
 vis/motions/till-right.ref                        |  7 +++++++
 vis/structural-regex/commands/filter-and-edit.in  |  2 +-
 vis/structural-regex/commands/filter-and-edit.ref |  2 +-
 7 files changed, 35 insertions(+), 28 deletions(-)
 delete mode 100644 vim/motions/till-right.in
 delete mode 100644 vim/motions/till-right.keys
 create mode 100644 vis/motions/till-right.in
 create mode 100644 vis/motions/till-right.keys
 create mode 100644 vis/motions/till-right.ref

diff --git a/vim/motions/till-right.in b/vim/motions/till-right.in
deleted file mode 100644
index 48defdd..0000000
--- a/vim/motions/till-right.in
+++ /dev/null
@@ -1,7 +0,0 @@
-Till before count occurrence of char to the right.
-
-Consecutive: ____
-Separated: _ _ _
-Invalid count: __
-Space: #
-Tab:	#
diff --git a/vim/motions/till-right.keys b/vim/motions/till-right.keys
deleted file mode 100644
index bf08d7b..0000000
--- a/vim/motions/till-right.keys
+++ /dev/null
@@ -1,19 +0,0 @@
-+
-3t_
-+
-;r|
-;;.
-;;.
-+
-;.
-;.
-;.
-;.
-+
-d3t_
-+
-t<Space>
-l.
-+
-t<Tab>
-l.
diff --git a/vis/motions/till-right.in b/vis/motions/till-right.in
new file mode 100644
index 0000000..48defdd
--- /dev/null
+++ b/vis/motions/till-right.in
@@ -0,0 +1,7 @@
+Till before count occurrence of char to the right.
+
+Consecutive: ____
+Separated: _ _ _
+Invalid count: __
+Space: #
+Tab:	#
diff --git a/vis/motions/till-right.keys b/vis/motions/till-right.keys
new file mode 100644
index 0000000..bf08d7b
--- /dev/null
+++ b/vis/motions/till-right.keys
@@ -0,0 +1,19 @@
++
+3t_
++
+;r|
+;;.
+;;.
++
+;.
+;.
+;.
+;.
++
+d3t_
++
+t<Space>
+l.
++
+t<Tab>
+l.
diff --git a/vis/motions/till-right.ref b/vis/motions/till-right.ref
new file mode 100644
index 0000000..e5a06a9
--- /dev/null
+++ b/vis/motions/till-right.ref
@@ -0,0 +1,7 @@
+Till before count occurrence of char to the right.
+
+Consecutive:|_||_
+Separated:|_|_|_
+Invalid count: __
+Space:|#
+Tab:|#
diff --git a/vis/structural-regex/commands/filter-and-edit.in b/vis/structural-regex/commands/filter-and-edit.in
index 62050e1..2b39786 100644
--- a/vis/structural-regex/commands/filter-and-edit.in
+++ b/vis/structural-regex/commands/filter-and-edit.in
@@ -1 +1 @@
-aaabaaabaaa
\ No newline at end of file
+aaabaaabaaa
diff --git a/vis/structural-regex/commands/filter-and-edit.ref b/vis/structural-regex/commands/filter-and-edit.ref
index 62050e1..2b39786 100644
--- a/vis/structural-regex/commands/filter-and-edit.ref
+++ b/vis/structural-regex/commands/filter-and-edit.ref
@@ -1 +1 @@
-aaabaaabaaa
\ No newline at end of file
+aaabaaabaaa
-- 
cgit v1.2.3