|
| 1 | +diff --git a/runtime/defaults.vim b/runtime/defaults.vim |
| 2 | +index f1d5cd1..b08de8e 100644 |
| 3 | +--- a/runtime/defaults.vim |
| 4 | ++++ b/runtime/defaults.vim |
| 5 | +@@ -74,18 +74,6 @@ sunmap Q |
| 6 | + " Revert with ":iunmap <C-U>". |
| 7 | + inoremap <C-U> <C-G>u<C-U> |
| 8 | + |
| 9 | +-" In many terminal emulators the mouse works just fine. By enabling it you |
| 10 | +-" can position the cursor, Visually select and scroll with the mouse. |
| 11 | +-" Only xterm can grab the mouse events when using the shift key, for other |
| 12 | +-" terminals use ":", select text and press Esc. |
| 13 | +-if has('mouse') |
| 14 | +- if &term =~ 'xterm' |
| 15 | +- set mouse=a |
| 16 | +- else |
| 17 | +- set mouse=nvi |
| 18 | +- endif |
| 19 | +-endif |
| 20 | +- |
| 21 | + " Only do this part when Vim was compiled with the +eval feature. |
| 22 | + if 1 |
| 23 | + |
| 24 | +diff --git a/src/testdir/test_balloon.vim b/src/testdir/test_balloon.vim |
| 25 | +index ed0c6c1..90c8c40 100644 |
| 26 | +--- a/src/testdir/test_balloon.vim |
| 27 | ++++ b/src/testdir/test_balloon.vim |
| 28 | +@@ -9,6 +9,7 @@ source screendump.vim |
| 29 | + CheckScreendump |
| 30 | + |
| 31 | + let s:common_script =<< trim [CODE] |
| 32 | ++ set mouse=a |
| 33 | + call setline(1, ["one one one", "two tXo two", "three three three"]) |
| 34 | + set balloonevalterm balloonexpr=MyBalloonExpr()..s:trailing balloondelay=100 |
| 35 | + let s:trailing = '<' " check that script context is set |
| 36 | +diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim |
| 37 | +index b91689e..c6b70d1 100644 |
| 38 | +--- a/src/testdir/test_popupwin.vim |
| 39 | ++++ b/src/testdir/test_popupwin.vim |
| 40 | +@@ -553,6 +553,7 @@ func Test_popup_drag() |
| 41 | + " create a popup that covers the command line |
| 42 | + let lines =<< trim END |
| 43 | + call setline(1, range(1, 20)) |
| 44 | ++ set mouse=a |
| 45 | + split |
| 46 | + vsplit |
| 47 | + $wincmd w |
| 48 | +@@ -621,6 +622,7 @@ func Test_popup_drag_minwidth() |
| 49 | + |
| 50 | + " create a popup that does not fit |
| 51 | + let lines =<< trim END |
| 52 | ++ set mouse=a |
| 53 | + call range(40) |
| 54 | + \ ->map({_,i -> string(i)}) |
| 55 | + \ ->popup_create({ |
| 56 | +@@ -669,6 +671,7 @@ func Test_popup_drag_termwin() |
| 57 | + let lines =<< trim END |
| 58 | + set foldmethod=marker |
| 59 | + call setline(1, range(100)) |
| 60 | ++ set mouse=a |
| 61 | + for nr in range(7) |
| 62 | + call setline(nr * 12 + 1, "fold {{{") |
| 63 | + call setline(nr * 12 + 11, "end }}}") |
| 64 | +@@ -722,6 +725,7 @@ func Test_popup_close_with_mouse() |
| 65 | + |
| 66 | + let lines =<< trim END |
| 67 | + call setline(1, range(1, 20)) |
| 68 | ++ set mouse=a |
| 69 | + " With border, can click on X |
| 70 | + let winid = popup_create('foobar', #{ |
| 71 | + \ close: 'button', |
| 72 | +@@ -1557,6 +1561,7 @@ func Test_popup_beval() |
| 73 | + let lines =<< trim END |
| 74 | + call setline(1, range(1, 20)) |
| 75 | + call setline(5, 'here is some text to hover over') |
| 76 | ++ set mouse=a |
| 77 | + set balloonevalterm |
| 78 | + set balloonexpr=BalloonExpr() |
| 79 | + set balloondelay=100 |
| 80 | +@@ -2262,6 +2267,7 @@ func Test_popup_scrollbar() |
| 81 | + |
| 82 | + let lines =<< trim END |
| 83 | + call setline(1, range(1, 20)) |
| 84 | ++ set mouse=a |
| 85 | + hi ScrollThumb ctermbg=blue |
| 86 | + hi ScrollBar ctermbg=red |
| 87 | + let winid = popup_create(['one', 'two', 'three', 'four', 'five', |
0 commit comments