From 70cb59efc947d4d91b38596fa6a30ccee9762a4c3f7604e51ac3927612f339d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Fri, 23 Mar 2018 19:54:16 +0000
Subject: [PATCH] Accepting request 590674 from home:lnussel:branches:editors

- instead of explicitly unsetting mouse, remove it from the defaults in the
  first place (boo#1079185, vim-8.0.1568-defaults.patch)

OBS-URL: https://build.opensuse.org/request/show/590674
OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=490
---
 suse.vimrc                  |  3 ---
 vim-8.0.1568-defaults.patch | 19 +++++++++++++++++++
 vim.changes                 |  6 ++++++
 vim.spec                    |  2 ++
 4 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 vim-8.0.1568-defaults.patch

diff --git a/suse.vimrc b/suse.vimrc
index 5c5c11f..403dd59 100644
--- a/suse.vimrc
+++ b/suse.vimrc
@@ -70,9 +70,6 @@ set nocompatible
 " allow backspacing over everything in insert mode 
 set backspace=indent,eol,start
 
-" Fix cut-n-paste bsc#1079185
-set mouse=
-
 " Complete longest common string, then each full match
 " enable this for bash compatible behaviour
 " set wildmode=longest,full
diff --git a/vim-8.0.1568-defaults.patch b/vim-8.0.1568-defaults.patch
new file mode 100644
index 0000000..ebd7592
--- /dev/null
+++ b/vim-8.0.1568-defaults.patch
@@ -0,0 +1,19 @@
+Index: vim-8.0.1568/runtime/defaults.vim
+===================================================================
+--- vim-8.0.1568.orig/runtime/defaults.vim
++++ vim-8.0.1568/runtime/defaults.vim
+@@ -75,9 +75,11 @@ 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
+-endif
++" disabled in (open)SUSE to make copy&paste work as most people
++" expect it bsc#1079185
++"if has('mouse')
++"  set mouse=a
++"endif
+ 
+ " Switch syntax highlighting on when the terminal has colors or when using the
+ " GUI (which always has colors).
diff --git a/vim.changes b/vim.changes
index 2cdd05d..1bbd400 100644
--- a/vim.changes
+++ b/vim.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Mar 23 12:15:38 UTC 2018 - lnussel@suse.de
+
+- instead of explicitly unsetting mouse, remove it from the defaults in the
+  first place (boo#1079185, vim-8.0.1568-defaults.patch)
+
 -------------------------------------------------------------------
 Thu Mar  8 10:44:01 UTC 2018 - idonmez@suse.com
 
diff --git a/vim.spec b/vim.spec
index dcb0f01..1ca3b0b 100644
--- a/vim.spec
+++ b/vim.spec
@@ -60,6 +60,7 @@ Patch22:        %{name}-7.4-filetype_mine.patch
 Patch23:        vim-8.0-ttytype-test.patch
 Patch24:        disable-unreliable-tests.patch
 Patch100:       vim73-no-static-libpython.patch
+Patch101:       vim-8.0.1568-defaults.patch
 BuildRequires:  autoconf
 BuildRequires:  db-devel
 BuildRequires:  fdupes
@@ -165,6 +166,7 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim
 %patch23 -p1
 %patch24 -p1
 %patch100 -p1
+%patch101 -p1
 cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} .
 
 # Unreliable tests