From 6efed2449dd520294a9b63c3aa2cd9c8e590dc59 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Sep 12 2017 07:19:31 +0000
Subject: Merge branch 'f27'


---

diff --git a/.gitignore b/.gitignore
index 6f8052e..13ce2ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -111,3 +111,4 @@
 /vim-8.0-1067.tar.bz2
 /vim-8.0-1071.tar.bz2
 /vim-8.0-1092.tar.bz2
+/vim-8.0-1097.tar.bz2
diff --git a/README.patches b/README.patches
index 19880d2..6a284a7 100644
--- a/README.patches
+++ b/README.patches
@@ -1,3 +1,52 @@
+commit 49a613f84aaa7cccd1d12a2ffc4ebb1956f973aa
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Sep 11 23:05:44 2017 +0200
+
+    patch 8.0.1097: background color wrong if job changes background color
+    
+    Problem:    Background color wrong if job changes background color.
+    Solution:   Get the background color from vterm.
+
+commit 238d43b32859d1b4e6b7072d552289a748cbfee1
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Sep 11 22:00:51 2017 +0200
+
+    patch 8.0.1096: terminal window in Normal mode has wrong background
+    
+    Problem:    Terminal window in Normal mode has wrong background.
+    Solution:   Store the default background and use it for clearning until the
+                end of the line.  Not for below the last line, since there is no
+                text there.
+
+commit a038cb5eab24a9c395861694d9b8f610ec0ccb61
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Sep 11 20:45:23 2017 +0200
+
+    patch 8.0.1095: terminal multibyte escrape test is flaky
+    
+    Problem:    Terminal multibyte escrape test is flaky.
+    Solution:   Add another condition to wait for.
+
+commit c212798333cab2239acd387725987f27c6d8a3f7
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Sep 11 20:34:13 2017 +0200
+
+    patch 8.0.1094: using ssh from Terminal.app runs into xterm incompatibility
+    
+    Problem:    Using ssh from Terminal.app runs into xterm incompatibility.
+    Solution:   Also detect Terminal.app on non-Mac systems.
+
+commit b4d5fbabc99917a8069ba32a60c2d73d4f60e128
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Mon Sep 11 19:31:28 2017 +0200
+
+    patch 8.0.1093: various small quickfix issues
+    
+    Problem:    Various small quickfix issues.
+    Solution:   Remove ":" prefix from title set by a user. Add the qf_id2nr().
+                function. Add a couple more tests.  Update documentation.
+                (Yegappan Lakshmanan)
+
 commit 45d5f26d11d9aac2383453d2c1a8582cad1c8a3d
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Sun Sep 10 19:14:31 2017 +0200
diff --git a/sources b/sources
index ab2f0c6..324dfd9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.0-1092.tar.bz2) = 7ace75233b8f565731c98ecfc4343bcb993fe88239cb5a06e97fc2404e89aa5f592a26fbe3a54ad9892f3f375fe9ad27da31e539b4df6c1899449c232de1e142
+SHA512 (vim-8.0-1097.tar.bz2) = 11e2d76b60a745036790a38aa4656b59cf59983e15917185e8a33846472b0b1bd9386170eed9312adfc5ef48f33b5245e6a2a86e0841c331c672516cc969570b
diff --git a/vim-update.sh b/vim-update.sh
index ff15a03..a0330dd 100755
--- a/vim-update.sh
+++ b/vim-update.sh
@@ -79,7 +79,7 @@ if [ $CHANGES -ne 0 ]; then
    fi
    # push
    $debug fedpkg push
-   if [ $? -eq 0 ]; then
+   if [ $? -ne 0 ]; then
      echo "Error: fedpkg push"
      exit 1
    fi
diff --git a/vim.spec b/vim.spec
index 73df155..27b958e 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 1092
+%define patchlevel 1097
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -774,6 +774,10 @@ rm -rf %{buildroot}
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Tue Sep 12 2017 Karsten Hopp <karsten@redhat.com> 8.0.1097-1
+- patchlevel 1097
+- editing vim-update.sh - wrong condition for checking fedkpg push return value
+
 * Mon Sep 11 2017 Karsten Hopp <karsten@redhat.com> 8.0.1092-1
 - editing vim-update.sh for building package
 - patchlevel 1092