From 973382463a5c805eabe8ee538ea2efe940405ff0 Mon Sep 17 00:00:00 2001
From: Karsten Hopp <karsten@redhat.com>
Date: Dec 12 2015 10:20:15 +0000
Subject: - patchlevel 969


---

diff --git a/.gitignore b/.gitignore
index d17a6c5..fd21fed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ vim-7.2.tar.bz2
 /vim-7.4-945.tar.bz2
 /vim-7.4-947.tar.bz2
 /vim-7.4-960.tar.bz2
+/vim-7.4-969.tar.bz2
diff --git a/README.patches b/README.patches
index 0201064..afaf689 100644
--- a/README.patches
+++ b/README.patches
@@ -1,3 +1,52 @@
+commit 35be4534c029148a89ccc41e8e465d793e7ed7c2
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Fri Dec 11 22:38:36 2015 +0100
+
+    patch 7.4.969
+    Problem:    Compiler warnings on Windowx x64 build.
+    Solution:   Add type casts. (Mike Williams)
+
+commit b65c749ac5a8a990d53493e3b9677142b1b9e4ce
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Fri Dec 11 20:53:58 2015 +0100
+
+    patch 7.4.968
+    Problem:    test86 and test87 are flaky in Appveyor.
+    Solution:   Reduce the count from 8 to 7. (suggested by ZyX)
+
+commit 6b90351786eb0915336b576cc930300bf5c9ac63
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Fri Dec 11 19:38:44 2015 +0100
+
+    patch 7.4.967
+    Problem:    Cross compilation on MS-windows doesn't work well.
+    Solution:   Tidy up cross compilation across architectures with Visual Studio.
+                (Mike Williams)
+
+commit 49222bee65228c7b5994b33c1568394c3cbf4583
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Fri Dec 11 18:11:30 2015 +0100
+
+    patch 7.4.966
+    Problem:    Configure doesn't work with a space in a path.
+    Solution:   Put paths in quotes. (James McCoy, close #525)
+
+commit 941aea2b975623a0c8bc24b140881ef0032a8bb8
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Fri Dec 11 17:14:27 2015 +0100
+
+    patch 7.4.965
+    Problem:    On FreeBSD /dev/fd/ files are special.
+    Solution:   Use is_dev_fd_file() also for FreeBSD. (Derek Schrock, closes #521)
+
+commit 91376b63877c113fe9a3fff2c1b04bf9504f447f
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Fri Dec 11 16:17:02 2015 +0100
+
+    patch 7.4.964
+    Problem:    Test 87 doesn't work in a shadow directory.
+    Solution:   Handle the extra subdirectory. (James McCoy, closes #515)
+
 commit 1c57fe8b9450eb29c3e42a94527d4b7514f853e2
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Sun Dec 6 14:53:18 2015 +0100
diff --git a/sources b/sources
index 9b2b682..0c3dab7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fd316b63bf4a2bb918a1045d5f4d2c85  vim-7.4-960.tar.bz2
+f2deb4fdf029e7364279f49ec1679be2  vim-7.4-969.tar.bz2
diff --git a/vim.spec b/vim.spec
index 6e3c6ab..40d5620 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 963
+%define patchlevel 969
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -756,6 +756,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Sat Dec 12 2015 Karsten Hopp <karsten@redhat.com> 7.4.969-1
+- patchlevel 969
+
 * Mon Dec 07 2015 Karsten Hopp <karsten@redhat.com> 7.4.963-1
 - patchlevel 963