From f4c008782db3f972b19498d7b2ba7fd9db38dafa Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Feb 01 2017 11:18:53 +0000
Subject: Merge branch 'f25'


---

diff --git a/.gitignore b/.gitignore
index 4ab2632..c97cb8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@
 /vim-8.0-238.tar.bz2
 /vim-8.0-271.tar.bz2
 /vim-8.0-273.tar.bz2
+/vim-8.0-275.tar.bz2
diff --git a/README.patches b/README.patches
index f2b7e87..48fcef2 100644
--- a/README.patches
+++ b/README.patches
@@ -1,3 +1,23 @@
+commit e3caa1109072b9655f8d5103c92efd73177f8577
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue Jan 31 22:07:42 2017 +0100
+
+    patch 8.0.0275: the screen may be updated at the wrong time
+    
+    Problem:    When checking for CTRL-C typed the GUI may detect a screen resize
+                and redraw the screen, causing trouble.
+    Solution:   Set updating_screen in ui_breakcheck().
+
+commit 070b33da93ad3a191664bb61f5ccc50781460c03
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue Jan 31 21:53:39 2017 +0100
+
+    patch 8.0.0274: possible recursive screen updating causes trouble
+    
+    Problem:    When update_single_line() is called recursively, or another screen
+                update happens while it is busy, errors may occur.
+    Solution:   Check and update updating_screen. (Christian Brabandt)
+
 commit c4a249a736d40ec54794827ef95804c225d0e38f
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Mon Jan 30 22:56:48 2017 +0100
diff --git a/sources b/sources
index 2e6a80d..2496fd2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.0-273.tar.bz2) = 765abf4ae172391f1d075026c1d11bb111d7936bc28ebd87803f494784255d07348a423477ac5021983af5407a7c83d5bc69f6e24fceb8c9b731353d8f4450d3
+SHA512 (vim-8.0-275.tar.bz2) = 8b54d6cd11fb1360235bb180e229e176e9aa112bf3be61c53c4b7577f4358678f05e16dcb88dd61305cc2536d8afd33fb0511324ee6ff3acdb20f78c41be3f0a
diff --git a/vim.spec b/vim.spec
index 9923edb..89564f7 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 273
+%define patchlevel 275
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -758,6 +758,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Wed Feb 01 2017 Karsten Hopp <karsten@redhat.com> 8.0.275-1
+- patchlevel 275
+
 * Tue Jan 31 2017 Karsten Hopp <karsten@redhat.com> 8.0.273-1
 - patchlevel 273