From ee8d7d407eb3a201421eda6721f0c0fb729ae0fa Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Dec 19 2016 07:11:36 +0000
Subject: f24->f25 vim: copy paste no longer works (bug #1401410) - revert previous changes, set mouse=v in defaults.vim


---

diff --git a/.gitignore b/.gitignore
index a53930d..0ce30ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
 /vim-8.0-118.tar.bz2
 /vim-8.0-124.tar.bz2
 /vim-8.0-133.tar.bz2
+/vim-8.0-134.tar.bz2
diff --git a/README.patches b/README.patches
index 26b40f3..855a72a 100644
--- a/README.patches
+++ b/README.patches
@@ -1,3 +1,11 @@
+commit c4bfedabe057c05f09a455a5851089e177fa9c00
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Wed Dec 14 21:42:00 2016 +0100
+
+    patch 8.0.0134
+    Problem:    Null pointer access reported by UBsan.
+    Solution:   Check curwin->w_buffer is not NULL. (Yegappan Lakshmanan)
+
 commit fe38b494fff56cd9b2fcaeef26a8fd7b6557d69c
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Sun Dec 11 21:34:23 2016 +0100
diff --git a/sources b/sources
index c5767ec..7a1904b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.0-133.tar.bz2) = bf2307afe3607f5fc768ce2537e2e829a435679f6e2d0fc2fe7039007210d8c73e06ba88e4daa90ee6db84f20a632495253f42d46d2381df708f1c855a99c4d4
+SHA512 (vim-8.0-134.tar.bz2) = f96cdb3e5fb2f53d4d1b8487da1929fd20d9a432526ce5eec45896ee2adfbec7762232635534639bd465bd3765840cdc95cc3d47194f38a5a44aa9182642d51c
diff --git a/vim-8.0-copy-paste.patch b/vim-8.0-copy-paste.patch
new file mode 100644
index 0000000..cdb6bd5
--- /dev/null
+++ b/vim-8.0-copy-paste.patch
@@ -0,0 +1,12 @@
+diff -up vim80/runtime/defaults.vim.copy-paste vim80/runtime/defaults.vim
+--- vim80/runtime/defaults.vim.copy-paste	2016-12-19 07:57:32.295973442 +0100
++++ vim80/runtime/defaults.vim	2016-12-19 07:58:44.760101540 +0100
+@@ -67,7 +67,7 @@ inoremap <C-U> <C-G>u<C-U>
+ " In many terminal emulators the mouse works just fine.  By enabling it you
+ " can position the cursor, Visually select and scroll with the mouse.
+ if has('mouse')
+-  set mouse=a
++  set mouse=v
+ endif
+ 
+ " Switch syntax highlighting on when the terminal has colors or when using the
diff --git a/vim.spec b/vim.spec
index 399baf7..7d265bf 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 133
+%define patchlevel 134
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -21,7 +21,7 @@ Summary: The VIM editor
 URL:     http://www.vim.org/
 Name: vim
 Version: %{baseversion}.%{patchlevel}
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: Vim
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2
@@ -64,6 +64,7 @@ Patch3012: vim-7.4-licensemacro-1151450.patch
 Patch3013: vim-7.4-globalsyntax.patch
 Patch3014: vim-7.4-releasestring-1318991.patch
 Patch3015: vim-8.0-rhbz1365258.patch
+Patch3016: vim-8.0-copy-paste.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python-devel python3-devel ncurses-devel gettext perl-devel
@@ -218,6 +219,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
 %patch3013 -p1
 %patch3014 -p1
 %patch3015 -p1
+%patch3016 -p1
 
 %build
 cp -f %{SOURCE6} .
@@ -756,9 +758,12 @@ rm -rf %{buildroot}
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
-* Thu Dec 15 2016 Zdenek Dohnal <zdohnal@redhat.com> - 8.0.133-3
+* Mon Dec 19 2016 Karsten Hopp <karsten@redhat.com> 8.0.134-1
+- patchlevel 134
+- f24->f25 vim: copy paste no longer works (bug #1401410) - revert previous changes, set mouse=v in defaults.vim
+
+* Thu Dec 15 2016 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.0.133-2
 - f24->f25 vim: copy paste no longer works (bug #1401410) - change mouse default setting to 'v'
->>>>>>> f25
 
 * Thu Dec 15 2016 Karsten Hopp <karsten@redhat.com> - 8.0.133-2
 - fix fstab syntax highlighting (rhbz#1365258)
diff --git a/vimrc b/vimrc
index db83796..cf66061 100644
--- a/vimrc
+++ b/vimrc
@@ -10,7 +10,6 @@ set viminfo='20,\"50	" read/write a .viminfo file, don't store more
 			" than 50 lines of registers
 set history=50		" keep 50 lines of command line history
 set ruler		" show the cursor position all the time
-set mouse=v
 
 " Only do this part when compiled with support for autocommands
 if has("autocmd")