From 81403cd689b25046f01f94993b2735c162a8ecec Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Jun 29 2017 07:20:07 +0000
Subject: Merge branch 'f25' into f26


---

diff --git a/.gitignore b/.gitignore
index 8d3d9ad..cf584ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -82,3 +82,4 @@
 /vim-8.0-662.tar.bz2
 /vim-8.0-679.tar.bz2
 /vim-8.0-685.tar.bz2
+/vim-8.0-688.tar.bz2
diff --git a/README.patches b/README.patches
index 425064c..07b03ce 100644
--- a/README.patches
+++ b/README.patches
@@ -1,3 +1,35 @@
+commit 9c4fefffb65a2ed9b4a5b0f1bde0da8f349470b5
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Wed Jun 28 22:26:54 2017 +0200
+
+    patch 8.0.0688: cannot resize the window in a FileType autocommand
+    
+    Problem:    Cannot resize the window in a FileType autocommand. (Ingo Karkat)
+    Solution:   Add the CMDWIN flag to :resize. (test by Ingo Karkat,
+                closes #1804)
+
+commit 86f100dc0922e83bead7bcd5fd2bb2abbf153f46
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Wed Jun 28 21:26:27 2017 +0200
+
+    patch 8.0.0687: minor issues related to quickfix
+    
+    Problem:    Minor issues related to quickfix.
+    Solution:   Set the proper return status for all cases in setqflist() and at
+                test cases for this.  Move the "adding" flag outside of
+                FEAT_WINDOWS. Minor update to the setqflist() help text. (Yegappan
+                Lakshmanan)
+
+commit 9f5f7bf4d5f757ef885acf74ce03c25429a328aa
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Wed Jun 28 20:45:26 2017 +0200
+
+    patch 8.0.0686: extra redraw when using CTRL-L in second window
+    
+    Problem:    When typing CTRL-L in a window that's not the first one, another
+                redraw will happen later. (Christian Brabandt)
+    Solution:   Reset must_redraw after calling screenclear().
+
 commit e6bf655bc4de1b7f4586e1f5c2fc4978141c3aa3
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Tue Jun 27 22:11:51 2017 +0200
diff --git a/sources b/sources
index 1b0a589..18641b8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.0-685.tar.bz2) = 3d4a429275a48c56a8ac4f60176ba29178779da1db2d1b579a7c10d04c6479c40655d25d8eaf59bd2326cea2308022130cadc8971dddf45df60e3f80eb06196e
+SHA512 (vim-8.0-688.tar.bz2) = caa7302bf3b3f63622b111a9a31d8698857b8e8db8d3e843eb2b11cade9fac52a2c7d8e33143ebc3794000f801860607becde457a15ef6d6cdeeec9d6283a53a
diff --git a/vim.spec b/vim.spec
index 4669198..debe113 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 685
+%define patchlevel 688
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -770,6 +770,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Thu Jun 29 2017 Karsten Hopp <karsten@redhat.com> 8.0.688-1
+- patchlevel 688
+
 * Wed Jun 28 2017 Karsten Hopp <karsten@redhat.com> 8.0.685-1
 - patchlevel 685