From 01e0eae8f6f5d4a9cbc8fcde6867a5daf4ef1abc Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Dec 19 2016 07:57:09 +0000
Subject: - f24->f25 vim: copy paste no longer works (bug #1401410) - deleting mouse settings block from defaults.vim


---

diff --git a/vim-8.0-copy-paste.patch b/vim-8.0-copy-paste.patch
index cdb6bd5..461777b 100644
--- a/vim-8.0-copy-paste.patch
+++ b/vim-8.0-copy-paste.patch
@@ -1,12 +1,16 @@
 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
+--- vim80/runtime/defaults.vim.copy-paste	2016-12-19 08:33:07.270919287 +0100
++++ vim80/runtime/defaults.vim	2016-12-19 08:51:51.196438644 +0100
+@@ -64,12 +64,6 @@ map Q gq
+ " Revert with ":iunmap <C-U>".
+ 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=v
+-endif
+-
  " Switch syntax highlighting on when the terminal has colors or when using the
+ " GUI (which always has colors).
+ if &t_Co > 2 || has("gui_running")
diff --git a/vim.spec b/vim.spec
index 7d265bf..d7dccba 100644
--- a/vim.spec
+++ b/vim.spec
@@ -21,7 +21,7 @@ Summary: The VIM editor
 URL:     http://www.vim.org/
 Name: vim
 Version: %{baseversion}.%{patchlevel}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Vim
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2
@@ -758,6 +758,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Mon Dec 19 2016 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.0.134-2
+- f24->f25 vim: copy paste no longer works (bug #1401410) - deleting mouse setting block from defaults.vim
+
 * 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