diff --git a/runtime/defaults.vim b/runtime/defaults.vim index ff8ce8e..2ed8542 100644 --- a/runtime/defaults.vim +++ b/runtime/defaults.vim @@ -75,18 +75,6 @@ sunmap Q " Revert with ":iunmap ". inoremap 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. -" Only xterm can grab the mouse events when using the shift key, for other -" terminals use ":", select text and press Esc. -if has('mouse') - if &term =~ 'xterm' - set mouse=a - else - set mouse=nvi - endif -endif - " Only do this part when Vim was compiled with the +eval feature. if 1 diff --git a/src/testdir/test_balloon.vim b/src/testdir/test_balloon.vim index 80d5831..713f580 100644 --- a/src/testdir/test_balloon.vim +++ b/src/testdir/test_balloon.vim @@ -9,6 +9,7 @@ source screendump.vim CheckScreendump let s:common_script =<< trim [CODE] + set mouse=a call setline(1, ["one one one", "two tXo two", "three three three"]) set balloonevalterm balloonexpr=MyBalloonExpr()..s:trailing balloondelay=100 let s:trailing = '<' " check that script context is set diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim index d930133..0c74032 100644 --- a/src/testdir/test_popup.vim +++ b/src/testdir/test_popup.vim @@ -945,6 +945,7 @@ func Test_mouse_popup_position() let script =<< trim END set mousemodel=popup_setpos source $VIMRUNTIME/menu.vim + set mouse=a call setline(1, join(range(20))) func Trigger(col) call test_setmouse(1, a:col) diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim index 64aa654..1a1261c 100644 --- a/src/testdir/test_popupwin.vim +++ b/src/testdir/test_popupwin.vim @@ -558,6 +558,7 @@ func Test_popup_drag() " create a popup that covers the command line let lines =<< trim END call setline(1, range(1, 20)) + set mouse=a split vsplit $wincmd w @@ -625,6 +626,7 @@ func Test_popup_drag_minwidth() " create a popup that does not fit let lines =<< trim END + set mouse=a call range(40) \ ->map({_,i -> string(i)}) \ ->popup_create({ @@ -672,6 +674,7 @@ func Test_popup_drag_termwin() let lines =<< trim END set foldmethod=marker call setline(1, range(100)) + set mouse=a for nr in range(7) call setline(nr * 12 + 1, "fold {{{") call setline(nr * 12 + 11, "end }}}") @@ -724,6 +727,7 @@ func Test_popup_close_with_mouse() let lines =<< trim END call setline(1, range(1, 20)) + set mouse=a " With border, can click on X let winid = popup_create('foobar', #{ \ close: 'button', @@ -1559,6 +1563,7 @@ func Test_popup_beval() let lines =<< trim END call setline(1, range(1, 20)) call setline(5, 'here is some text to hover over') + set mouse=a set balloonevalterm set balloonexpr=BalloonExpr() set balloondelay=100 @@ -2255,6 +2260,7 @@ func Test_popup_scrollbar() let lines =<< trim END call setline(1, range(1, 20)) + set mouse=a hi ScrollThumb ctermbg=blue hi ScrollBar ctermbg=red let winid = popup_create(['one', 'two', 'three', 'four', 'five',