From 39a2a538338c4a64d1bb5553fe520ad54ba0eb7e Mon Sep 17 00:00:00 2001
From: Karsten Hopp <karsten@redhat.com>
Date: Sun, 13 Dec 2015 11:20:15 +0100
Subject: [PATCH] - patchlevel 970

---
 .gitignore     | 1 +
 README.patches | 9 +++++++++
 sources        | 2 +-
 vim.spec       | 5 ++++-
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index fd21fed9..7d045935 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ vim-7.2.tar.bz2
 /vim-7.4-947.tar.bz2
 /vim-7.4-960.tar.bz2
 /vim-7.4-969.tar.bz2
+/vim-7.4-970.tar.bz2
diff --git a/README.patches b/README.patches
index afaf6898..084ed516 100644
--- a/README.patches
+++ b/README.patches
@@ -1,3 +1,12 @@
+commit 9ec021a2b0dd35ba744a8e2a9430a643c85b922a
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Sat Dec 12 16:23:29 2015 +0100
+
+    patch 7.4.970
+    Problem:    Rare crash in getvcol(). (Timo Mihaljov)
+    Solution:   Check for the buffer being NULL in init_preedit_start_col.
+                (Hirohito Higashi, Christian Brabandt)
+
 commit 35be4534c029148a89ccc41e8e465d793e7ed7c2
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Fri Dec 11 22:38:36 2015 +0100
diff --git a/sources b/sources
index 0c3dab7c..b9ff5f5a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f2deb4fdf029e7364279f49ec1679be2  vim-7.4-969.tar.bz2
+76d656176c31a6d9150887d537efa04f  vim-7.4-970.tar.bz2
diff --git a/vim.spec b/vim.spec
index 40d5620f..74278551 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 969
+%define patchlevel 970
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -756,6 +756,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Sun Dec 13 2015 Karsten Hopp <karsten@redhat.com> 7.4.970-1
+- patchlevel 970
+
 * Sat Dec 12 2015 Karsten Hopp <karsten@redhat.com> 7.4.969-1
 - patchlevel 969