From 7029dec0ae82338ec6dd26325c94d46287a19828 Mon Sep 17 00:00:00 2001
From: KillTheMule <KillTheMule@users.noreply.github.com>
Date: Tue, 19 Apr 2016 21:53:14 +0200
Subject: [PATCH] vim-patch:7.4.819

Problem:    Beeping when running the tests.
Solution:   Fix 41 beeps. (Roland Eggner)

https://github.com/vim/vim/commit/901e58c243ef4363bb2c13b2c96c7b0acd45e6d1

Applied cleanly, except for files test29.in, test4.in, test61.in, test82.in,
test83.in, test90.in, test95.in, which were all converted to lua tests, and
version.c.

Some beeps remain, but this is much better.
---
 src/nvim/testdir/test17.in | 26 +++++++++++++-------------
 src/nvim/version.c         |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/nvim/testdir/test17.in b/src/nvim/testdir/test17.in
index 7fef87d383..a8c81b832d 100644
--- a/src/nvim/testdir/test17.in
+++ b/src/nvim/testdir/test17.in
@@ -41,17 +41,17 @@ STARTTEST
 :!mkdir Xdir1
 :!mkdir "Xdir1/dir2"
 :e! Xdir1/dir2/foo.a
-i#include   "bar.a"
+i#include   "bar.a":
 :w
 :e Xdir1/dir2/bar.a
-i#include      "baz.a"
+i#include      "baz.a":
 :w
 :e Xdir1/dir2/baz.a
-i#include            "foo.a"
+i#include            "foo.a":
 :w
 :e Xbase.a
 :set path=Xdir1/dir2
-i#include    <foo.a>
+i#include    <foo.a>:
 :w
 :redir! >>test.out
 :checkpath!
@@ -71,17 +71,17 @@ STARTTEST
 :endfunction
 :let &includeexpr='DotsToSlashes()'
 :e! Xdir1/dir2/foo.b
-i%inc   /bar/
+i%inc   /bar/:
 :w
 :e Xdir1/dir2/bar.b
-i%inc      /baz/
+i%inc      /baz/:
 :w
 :e Xdir1/dir2/baz.b
-i%inc            /foo/
+i%inc            /foo/:
 :w
 :e Xbase.b
 :set path=Xdir1/dir2
-i%inc    /foo/
+i%inc    /foo/:
 :w
 :redir! >>test.out
 :checkpath!
@@ -104,20 +104,20 @@ STARTTEST
 :endfunction
 :let &includeexpr='StripNewlineChar()'
 :e! Xdir1/dir2/foo.c
-i%inc   bar.c
+i%inc   bar.c:
 :w
 :e Xdir1/dir2/bar.c
-i%inc      baz.c
+i%inc      baz.c:
 :w
 :e Xdir1/dir2/baz.c
-i%inc            foo.c
+i%inc            foo.c:
 :w
 :e Xdir1/dir2/FALSE.c
-i%inc            foo.c
+i%inc            foo.c:
 :w
 :e Xbase.c
 :set path=Xdir1/dir2
-i%inc    FALSE.c foo.c
+i%inc    FALSE.c foo.c:
 :w
 :redir! >>test.out
 :checkpath!
diff --git a/src/nvim/version.c b/src/nvim/version.c
index e0d5e984cd..75983a00e1 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -545,7 +545,7 @@ static int included_patches[] = {
   // 822,
   // 821 NA
   820,
-  // 819,
+  819,
   818,
   817,
   816,