From b1aca4ca5db2272176174e618abd4002d31c62ee Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Mar 22 2017 17:27:51 +0000
Subject: Merge branch 'f25' into f26


---

diff --git a/.gitignore b/.gitignore
index 8e86a2f..28c5305 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,3 +52,4 @@
 /vim-8.0-458.tar.bz2
 /vim-8.0-494.tar.bz2
 /vim-8.0-497.tar.bz2
+/vim-8.0-502.tar.bz2
diff --git a/README.patches b/README.patches
index ac3b67c..fe57ea0 100644
--- a/README.patches
+++ b/README.patches
@@ -1,3 +1,56 @@
+commit a37ffaa5e0a47e2db27bc0cc23f49e7094f47f3b
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue Mar 21 21:58:00 2017 +0100
+
+    patch 8.0.0502: Coverity complains about possible NULL pointer
+    
+    Problem:    Coverity complains about possible NULL pointer.
+    Solution:   Add an assert(), let's see if this works on all systems.
+
+commit b2964f2570574b4c66f3645d69956fec99f2af3e
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue Mar 21 19:29:26 2017 +0100
+
+    patch 8.0.0501: on MS-Windows ":!start" does not work as expected
+    
+    Problem:    On MS-Windows ":!start" does not work as expected.
+    Solution:   When creating a process fails try passing the argument to
+                ShellExecute().  (Katsuya Hino, closes #1570)
+
+commit 3c2881dc1195f53ebafc387378399ddd6cb677a7
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue Mar 21 19:18:29 2017 +0100
+
+    Update runtime files.  Add Rust support.
+
+commit 4889ad7c6cd46368f553cc1140ca17508e8beaaa
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue Mar 21 18:02:41 2017 +0100
+
+    patch 8.0.0500: quotestar test is still a bit flaky
+    
+    Problem:    Quotestar test is still a bit flaky.
+    Solution:   Add a slower check for v:version.
+
+commit c6aafbaf3ea755e3ab4ee2e3045911126a08b038
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue Mar 21 17:09:10 2017 +0100
+
+    patch 8.0.0499: taglist() does not prioritize tags for a buffer
+    
+    Problem:    taglist() does not prioritize tags for a buffer.
+    Solution:   Add an optional buffer argument. (Duncan McDougall, closes #1194)
+
+commit e94260f3582cf928cc59e792b3b6ede57794a4a6
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue Mar 21 15:50:12 2017 +0100
+
+    patch 8.0.0498: two autocmd tests are skipped on MS-Windows
+    
+    Problem:    Two autocmd tests are skipped on MS-Windows.
+    Solution:   Make the test pass on MS-Windows. Write the messages in a file
+                instead of getting the output of system().
+
 commit 3ff2f09525e3461419886763efa1a01f08882d8c
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Tue Mar 21 13:22:44 2017 +0100
diff --git a/sources b/sources
index ed0e999..a3763c3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.0-497.tar.bz2) = 817c143b9b979fa1c70cdc265c952296d42f055dab690ed6cc62d6afa02744f9844407b2197a25debe9508543d1a7ffc396285dc75cc1272359566852541a85d
+SHA512 (vim-8.0-502.tar.bz2) = 3239cfd9ba1e745dbba6f95267d18dd71ab73b3b68d2a0a0ac392833c5bb2bf258f62a618370f13ab6c2ad80e679127e0dd96d26351459b41a1c76e6013e5c9f
diff --git a/vim.spec b/vim.spec
index 9e1dda6..8e50ee3 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 497
+%define patchlevel 502
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -768,6 +768,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Wed Mar 22 2017 Karsten Hopp <karsten@redhat.com> 8.0.502-1
+- patchlevel 502
+
 * Tue Mar 21 2017 Karsten Hopp <karsten@redhat.com> 8.0.497-1
 - patchlevel 497