From 1746db958f3e4fcc6d02a562f0de8617d7c70220 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Jul 20 2017 10:42:52 +0000
Subject: Merge branch 'f25' into f26


---

diff --git a/.gitignore b/.gitignore
index b0eb616..f4716a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -88,3 +88,4 @@
 /vim-8.0-711.tar.bz2
 /vim-8.0-728.tar.bz2
 /vim-8.0-730.tar.bz2
+/vim-8.0-738.tar.bz2
diff --git a/README.patches b/README.patches
index 1794d0d..bb47592 100644
--- a/README.patches
+++ b/README.patches
@@ -1,3 +1,92 @@
+commit e825d8b0a4173871272b723f1c1f5b95ee981067
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Wed Jul 19 23:20:19 2017 +0200
+
+    patch 8.0.0738: cannot use the mouse to resize a terminal window
+    
+    Problem:    Cannot use the mouse to resize window while the focus is in a
+                terminal window.
+    Solution:   Recognize nice mouse events in the terminal window.  A few more
+                fixes for the terminal window.
+
+commit cdb7e1b7f9e18a7b165ff09103a9994f84966123
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Wed Jul 19 19:55:58 2017 +0200
+
+    patch 8.0.0737: crash when X11 selection is very big
+    
+    Problem:    Crash when X11 selection is very big.
+    Solution:   Use static items instead of allocating them.  Add callbacks.
+                (Ozaki Kiichi)
+
+commit 04f62f881c5743d2fdaf7324f6a715381f0d5fcf
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Wed Jul 19 18:18:39 2017 +0200
+
+    patch 8.0.0736: OptionSet not triggered when entering diff mode
+    
+    Problem:    The OptionSet autocommand event is not triggered when entering
+                diff mode.
+    Solution:   use set_option_value() instead of setting the option directly.
+                Change the tests from old to new style. (Christian Brabandt)
+
+commit a8788f4d0b991f466b607c2c5bc6fd600bc78a97
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Wed Jul 19 17:06:20 2017 +0200
+
+    patch 8.0.0735: no indication that the quickfix window/buffer changed
+    
+    Problem:    There is no way to notice that the quickfix window contents has
+                changed.
+    Solution:   Increment b:changedtick when updating the quickfix window.
+                (Yegappan Lakshmanan)
+
+commit bf92e3a3719f255dbb30102ceb618e0eac7c9497
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Wed Jul 19 14:59:34 2017 +0200
+
+    Update translations.
+
+commit 7f93703149a46980f1588ff6b819f52e13084141
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Wed Jul 19 14:34:42 2017 +0200
+
+    patch 8.0.0734: the script to check translations can be improved
+    
+    Problem:    The script to check translations can be improved.
+    Solution:   Restore the view when no errors are found.  Check for matching
+                line break at the end of the message. (Christian Brabandt)
+
+commit a7df8c70c85c793bc4d75abc625d36883ab029cc
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Wed Jul 19 13:23:06 2017 +0200
+
+    patch 8.0.0733: can only add entries to one list in the quickfix stack
+    
+    Problem:    Can only add entries to one list in the quickfix stack.
+    Solution:   Move state variables from qf_list_T to qf_list_T. (Yegappan
+                Lakshmanan)
+
+commit 80dd3f9d41ce2ff6ab3544cdb266627bbdfc34a6
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Wed Jul 19 12:51:52 2017 +0200
+
+    patch 8.0.0732: when updating a buffer modeless selection is lost
+    
+    Problem:    When updating a buffer for a callback the modeless selection is
+                lost.
+    Solution:   Do not insert or delete screen lines when redrawing for a callback
+                and there is a modeless selection.
+
+commit 4fc63505d393451ad3780dc0390cb48587597aaf
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Wed Jul 19 11:28:17 2017 +0200
+
+    patch 8.0.0731: cannot build the terminal feature on MS-Windows
+    
+    Problem:    Cannot build the terminal feature on MS-Windows.
+    Solution:   Add the Makefile changes. (Yasuhiro Matsumoto, closes #1851)
+
 commit 8c0095c59a34ef74fb873036cfbf1aa90be449f3
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Tue Jul 18 22:53:21 2017 +0200
diff --git a/sources b/sources
index f0159aa..c59a3b3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.0-730.tar.bz2) = 36aa523d5f980a0f1e50db8f5cb2ff5e334f095c543450a19d9d860b707c9588449d6f84d739f2e7d81172b300df81830a434a660156234e0137d1ca5073ed62
+SHA512 (vim-8.0-738.tar.bz2) = 7140d6a1265ce717da85e386db509bfeabec0deb852884e8de4c98b291119797005ca0399f22ea478707f09654b03326a9c472e6e38ca69cc7742e982a824047
diff --git a/vim.spec b/vim.spec
index 19b8559..8b5ce4c 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 730
+%define patchlevel 738
 %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 Jul 20 2017 Karsten Hopp <karsten@redhat.com> 8.0.738-1
+- patchlevel 738
+
 * Wed Jul 19 2017 Karsten Hopp <karsten@redhat.com> 8.0.730-1
 - patchlevel 730