From 8f1de5c73804f2e222dca18062b9a0b4c07a76a9 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Apr 06 2017 13:25:35 +0000
Subject: Merge branch 'f25' into f26


---

diff --git a/.gitignore b/.gitignore
index a49721f..d9f9497 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,3 +60,4 @@
 /vim-8.0-525.tar.bz2
 /vim-8.0-529.tar.bz2
 /vim-8.0-540.tar.bz2
+/vim-8.0-543.tar.bz2
diff --git a/README.patches b/README.patches
index def37b8..d48c0c4 100644
--- a/README.patches
+++ b/README.patches
@@ -1,3 +1,31 @@
+commit ba6ec182973af726ce9b7b7eb3753fc3a7ae7d1b
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue Apr 4 22:41:10 2017 +0200
+
+    patch 8.0.0543: test_edit causes older xfce4-terminal to close
+    
+    Problem:    Test_edit causes older xfce4-terminal to close. (Dominique Pelle)
+    Solution:   Reduce number of columns to 2000.  Try to restore the window
+                position.
+
+commit a1d5fa65bc7e8a548858e9c295a192b63dcd011b
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Apr 3 22:02:55 2017 +0200
+
+    patch 8.0.0542: getpos() can return a negative line number
+    
+    Problem:    getpos() can return a negative line number. (haya14busa)
+    Solution:   Handle a zero topline and botline. (closes #1613)
+
+commit 04000560ca81cc2608b291d0990e661b41ca8c68
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Apr 3 21:35:42 2017 +0200
+
+    patch 8.0.0541: compiler warning on MS-Windows
+    
+    Problem:    Compiler warning on MS-Windows.
+    Solution:   Add a type cast. (Mike Williams)
+
 commit a604429529ce3d3c97309c7cf6bba8b699f6bfb5
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Sun Apr 2 18:19:53 2017 +0200
diff --git a/sources b/sources
index b3465d4..7316a72 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.0-540.tar.bz2) = 0a79e60d9c1dd61fa8b8910d485b6d9233be696a50b292c61be26c54919631111842cc9ec8e6aa5d3aefb67841a5a6a9275f521b7c2c79d1aa65c157b746a929
+SHA512 (vim-8.0-543.tar.bz2) = 75717d75a757acb37a5ba057e6dd5d3d949e9d30b30bc704354b5cb413aff6dbf048bb6c71226aa20f2477461eaa9cea80e72b1270e6a932e4c78eaa4f0e66db
diff --git a/vim.spec b/vim.spec
index 5e15ca8..f6a8c33 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 540
+%define patchlevel 543
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -770,6 +770,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Thu Apr 06 2017 Karsten Hopp <karsten@redhat.com> 8.0.543-1
+- patchlevel 543
+
 * Mon Apr 03 2017 Karsten Hopp <karsten@redhat.com> 8.0.540-1
 - patchlevel 540