From d54671d5345c335f737bcb23cc10c6c3a0abb99d Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Jun 28 2017 07:15:43 +0000
Subject: Merge branch 'f25' into f26


---

diff --git a/.gitignore b/.gitignore
index 9e00fa3..8d3d9ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -81,3 +81,4 @@
 /vim-8.0-648.tar.bz2
 /vim-8.0-662.tar.bz2
 /vim-8.0-679.tar.bz2
+/vim-8.0-685.tar.bz2
diff --git a/README.patches b/README.patches
index c64a305..425064c 100644
--- a/README.patches
+++ b/README.patches
@@ -1,3 +1,64 @@
+commit e6bf655bc4de1b7f4586e1f5c2fc4978141c3aa3
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue Jun 27 22:11:51 2017 +0200
+
+    patch 8.0.0685: when conversion fails written file may be truncated
+    
+    Problem:    When making backups is disabled and conversion with iconv fails
+                the written file is truncated. (Luo Chen)
+    Solution:   First try converting the file and write the file only when it did
+                not fail. (partly by Christian Brabandt)
+
+commit 28b238225ae618f63cfe5d3d723120960a941da7
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue Jun 27 18:29:17 2017 +0200
+
+    patch 8.0.0684: old style tests are not nice
+    
+    Problem:    Old style tests are not nice.
+    Solution:   Turn two tests into new style. (pschuh, closes #1797)
+
+commit 2e147caa14f622dfd1c1def8e07c113b9b85d4b2
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue Jun 27 17:09:37 2017 +0200
+
+    patch 8.0.0683: visual bell flashes too quickly
+    
+    Problem:    When using a visual bell there is no delay, causing the flash to
+                be very short, possibly unnoticeable.  Also, the flash and the
+                beep can lockup the UI when repeated often.
+    Solution:   Do the delay in Vim or flush the output before the delay. Limit the
+                bell to once per half a second. (Ozaki Kiichi, closes #1789)
+
+commit 0b2eef24bcbe2c85c90bbde914a1782cbedc5c72
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue Jun 27 15:43:49 2017 +0200
+
+    patch 8.0.0682: no test for synIDtrans()
+    
+    Problem:    No test for synIDtrans().
+    Solution:   Add a test. (Dominique Pelle, closes #1796)
+
+commit 18d90b95c49d9ff1c635dd762864022aab8e71f1
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue Jun 27 15:39:14 2017 +0200
+
+    patch 8.0.0681: unnamed register only contains the last deleted text
+    
+    Problem:    Unnamed register only contains the last deleted text when
+                appending deleted text to a register. (Wolfgang Jeltsch)
+    Solution:   Only set y_previous when not using y_append. (Christian Brabandt)
+
+commit 07ecfa64a18609a986f21d6132d04ee8934f3200
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue Jun 27 14:43:55 2017 +0200
+
+    patch 8.0.0680: plugins in start packages are sourced twice
+    
+    Problem:    Plugins in start packages are sourced twice. (mseplowitz)
+    Solution:   Use the unmodified runtime path when loading plugins (test by Ingo
+                Karkat, closes #1801)
+
 commit 41cc038ff83498c589c7d25b3d2984145528eb92
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Mon Jun 26 09:59:35 2017 +0200
diff --git a/sources b/sources
index 2185e86..1b0a589 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.0-679.tar.bz2) = d45f133e76416b353d4a8157495f4d164c84d12ec0b709108f5cad8069eefc4dee0db9f928dcb63059f55594135ccb2ffbe4f9248fad791c8aede305ede82170
+SHA512 (vim-8.0-685.tar.bz2) = 3d4a429275a48c56a8ac4f60176ba29178779da1db2d1b579a7c10d04c6479c40655d25d8eaf59bd2326cea2308022130cadc8971dddf45df60e3f80eb06196e
diff --git a/vim.spec b/vim.spec
index 962d639..4669198 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 679
+%define patchlevel 685
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -770,6 +770,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Wed Jun 28 2017 Karsten Hopp <karsten@redhat.com> 8.0.685-1
+- patchlevel 685
+
 * Mon Jun 26 2017 Karsten Hopp <karsten@redhat.com> 8.0.679-1
 - patchlevel 679