rpms/vim
5
0
Fork 0
Code Issues Pull Requests Releases Activity

vim-8.0-copy-paste.patch: update the patch for patchlevel 4198

Browse Source
This commit is contained in:
Zdenek Dohnal 2022-01-24 12:20:40 +01:00
parent 9c76347c0f
commit 380067b1da
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
vim-8.0-copy-paste.patch
View File

@ -1,7 +1,6 @@
diff --git a/runtime/defaults.vim b/runtime/defaults.vim diff -up vim82/runtime/defaults.vim.copypaste vim82/runtime/defaults.vim
index f3c639b..20637e2 100644 --- vim82/runtime/defaults.vim.copypaste 2022-01-24 12:13:43.000000000 +0100
--- a/runtime/defaults.vim +++ vim82/runtime/defaults.vim 2022-01-24 12:15:41.050120573 +0100
+++ b/runtime/defaults.vim
@@ -73,18 +73,6 @@ map Q gq @@ -73,18 +73,6 @@ map Q gq
" Revert with ":iunmap <C-U>". " Revert with ":iunmap <C-U>".
inoremap <C-U> <C-G>u<C-U> inoremap <C-U> <C-G>u<C-U>
@ -21,22 +20,20 @@ index f3c639b..20637e2 100644
" Only do this part when Vim was compiled with the +eval feature. " Only do this part when Vim was compiled with the +eval feature.
if 1 if 1
diff --git a/src/testdir/test_balloon.vim b/src/testdir/test_balloon.vim diff -up vim82/src/testdir/test_balloon.vim.copypaste vim82/src/testdir/test_balloon.vim
index 319e546..8fcf63c 100644 --- vim82/src/testdir/test_balloon.vim.copypaste 2022-01-24 12:15:41.051120576 +0100
--- a/src/testdir/test_balloon.vim +++ vim82/src/testdir/test_balloon.vim 2022-01-24 12:17:02.604372440 +0100
+++ b/src/testdir/test_balloon.vim
@@ -9,6 +9,7 @@ source screendump.vim @@ -9,6 +9,7 @@ source screendump.vim
CheckScreendump CheckScreendump
let s:common_script =<< trim [CODE] let s:common_script =<< trim [CODE]
+ set mouse=a + set mouse=a
call setline(1, ["one one one", "two tXo two", "three three three"]) call setline(1, ["one one one", "two tXo two", "three three three"])
set balloonevalterm balloonexpr=MyBalloonExpr() balloondelay=100 set balloonevalterm balloonexpr=MyBalloonExpr()..s:trailing balloondelay=100
func MyBalloonExpr() let s:trailing = '<' " check that script context is set
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim diff -up vim82/src/testdir/test_popupwin.vim.copypaste vim82/src/testdir/test_popupwin.vim
index f13252b..ec755a4 100644 --- vim82/src/testdir/test_popupwin.vim.copypaste 2022-01-24 12:13:44.000000000 +0100
--- a/src/testdir/test_popupwin.vim +++ vim82/src/testdir/test_popupwin.vim 2022-01-24 12:18:24.382624989 +0100
+++ b/src/testdir/test_popupwin.vim
@@ -553,6 +553,7 @@ func Test_popup_drag() @@ -553,6 +553,7 @@ func Test_popup_drag()
" create a popup that covers the command line " create a popup that covers the command line
let lines =<< trim END let lines =<< trim END
@ -45,15 +42,15 @@ index f13252b..ec755a4 100644
split split
vsplit vsplit
$wincmd w $wincmd w
@@ -599,6 +600,7 @@ func Test_popup_drag_termwin() @@ -625,6 +626,7 @@ func Test_popup_drag_termwin()
let lines =<< trim END let lines =<< trim END
set foldmethod=marker set foldmethod=marker
call setline(1, range(100)) call setline(1, range(100))
+ set mouse=a + set mouse=a
for nr in range(7) for nr in range(7)
call setline(nr * 12 + 1, "fold {{{") call setline(nr * 12 + 1, "fold {{{")
call setline(nr * 12 + 11, "end }}}") call setline(nr * 12 + 11, "end }}}")
@@ -652,6 +654,7 @@ func Test_popup_close_with_mouse() @@ -678,6 +680,7 @@ func Test_popup_close_with_mouse()
let lines =<< trim END let lines =<< trim END
call setline(1, range(1, 20)) call setline(1, range(1, 20))
@ -61,7 +58,7 @@ index f13252b..ec755a4 100644
" With border, can click on X " With border, can click on X
let winid = popup_create('foobar', #{ let winid = popup_create('foobar', #{
\ close: 'button', \ close: 'button',
@@ -1479,6 +1482,7 @@ func Test_popup_beval() @@ -1513,6 +1516,7 @@ func Test_popup_beval()
let lines =<< trim END let lines =<< trim END
call setline(1, range(1, 20)) call setline(1, range(1, 20))
call setline(5, 'here is some text to hover over') call setline(5, 'here is some text to hover over')
@ -69,7 +66,7 @@ index f13252b..ec755a4 100644
set balloonevalterm set balloonevalterm
set balloonexpr=BalloonExpr() set balloonexpr=BalloonExpr()
set balloondelay=100 set balloondelay=100
@@ -2170,6 +2174,7 @@ func Test_popup_scrollbar() @@ -2218,6 +2222,7 @@ func Test_popup_scrollbar()
let lines =<< trim END let lines =<< trim END
call setline(1, range(1, 20)) call setline(1, range(1, 20))