From 15f884d4fc77428b54e8d02925f13fd338043239 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Jun 12 2017 14:24:03 +0000
Subject: Merge branch 'f25' into f26


---

diff --git a/.gitignore b/.gitignore
index f135068..cc53a0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,3 +75,4 @@
 /vim-8.0-617.tar.bz2
 /vim-8.0-627.tar.bz2
 /vim-8.0-628.tar.bz2
+/vim-8.0-636.tar.bz2
diff --git a/README.patches b/README.patches
index 7dd2fde..7364556 100644
--- a/README.patches
+++ b/README.patches
@@ -1,3 +1,80 @@
+commit 56f2db562ddc6c69026d55360f0cfaacd8adc26a
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Sun Jun 11 23:09:15 2017 +0200
+
+    patch 8.0.0636: when reading the undo file fails may use uninitialized data
+    
+    Problem:    When reading the undo file fails may use uninitialized data.
+    Solution:   Always clear the buffer on failure.
+
+commit 3a429efb628a3925d13c3fe415e02a7ce117071f
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Sun Jun 11 17:10:32 2017 +0200
+
+    patch 8.0.0635: when 'ignorecase' is set script detection is inaccurate
+    
+    Problem:    When 'ignorecase' is set script detection is inaccurate.
+    Solution:   Enforce matching case for text. (closes #1753)
+
+commit 875feea6ce223462d55543735143d747dcaf4287
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Sun Jun 11 16:07:51 2017 +0200
+
+    patch 8.0.0634: cannot easily get to the last quickfix list
+    
+    Problem:    Cannot easily get to the last quickfix list.
+    Solution:   Add "$" as a value for the "nr" argument of getqflist() and
+                setqflist(). (Yegappan Lakshmanan)
+
+commit 60964f68740b8abcbb2d3f0f3aeade21d1bacb22
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Sat Jun 10 17:06:16 2017 +0200
+
+    patch 8.0.0633: the client-server test is still a bit flaky
+    
+    Problem:    The client-server test is still a bit flaky.
+    Solution:   Wait a bit for the GUI to start.  Check that the version number
+                can be obtained.
+
+commit 1c13c0fe3e7b15750464ffbc39a4648aa5c639be
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Sat Jun 10 16:30:32 2017 +0200
+
+    patch 8.0.0632: the quotestar test is still a bit flaky
+    
+    Problem:    The quotestar test is still a bit flaky.
+    Solution:   Kill any existing server to make the retry work.  Wait for the
+                register to be filled.
+
+commit fa4161cb0c266378012d3fde0eca56da8739528d
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Sat Jun 10 15:46:23 2017 +0200
+
+    patch 8.0.0631: can't build with Perl 5.26
+    
+    Problem:    Perl 5.26 also needs S_TOPMARK and S_POPMARK defined.
+    Solution:   Define the functions when needed. (Jesin, closes #1748)
+
+commit f84b122a99da75741ae686fabb6f81b8b4755998
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Sat Jun 10 14:29:52 2017 +0200
+
+    patch 8.0.0630: it is not easy to work on lines without a match
+    
+    Problem:    The :global command does not work recursively, which makes it
+                difficult to execute a command on a line where one pattern matches
+                and another does not match. (Miles Cranmer)
+    Solution:   Allow for recursion if it is for only one line. (closes #1760)
+
+commit 6b1da3312e15c065b373c9ec2732f31a77cee61f
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Fri Jun 9 21:35:47 2017 +0200
+
+    patch 8.0.0629: checking for ambigous width is not working
+    
+    Problem:    Checking for ambigous width is not working. (Hirohito Higashi)
+    Solution:   Reset "starting" earlier.
+
 commit f085f4266e07b36279c56d43fd0d73ed080046ae
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Wed Jun 7 20:39:47 2017 +0200
diff --git a/sources b/sources
index 6895bd8..a9d1675 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.0-628.tar.bz2) = d20f2c5032dd140ddd30559033ff6ece9af5066036046b80a77081fdd87e7bb69ad6081fc0ce04ed13cd9d400b6cfa6b6fac7519e08e6831827001885f657e3f
+SHA512 (vim-8.0-636.tar.bz2) = 8a6562c2bc84986fe541fbe21f88d327856ae963c55c55163ebe84f558cf4483ebe8b5c58b025e89c8b615c889e7427981b41b4da3cf612d2dc5d5f5a36dc8a5
diff --git a/vim.spec b/vim.spec
index ec27e16..6cbae32 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 628
+%define patchlevel 636
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -770,6 +770,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Mon Jun 12 2017 Karsten Hopp <karsten@redhat.com> 8.0.636-1
+- patchlevel 636
+
 * Fri Jun 09 2017 Karsten Hopp <karsten@redhat.com> 8.0.628-1
 - patchlevel 628