Blob Blame History Raw
diff -up vim82/runtime/defaults.vim.copypaste vim82/runtime/defaults.vim
--- vim82/runtime/defaults.vim.copypaste	2022-01-24 12:13:43.000000000 +0100
+++ vim82/runtime/defaults.vim	2022-01-24 12:15:41.050120573 +0100
@@ -73,18 +73,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.
-" 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 -up vim82/src/testdir/test_balloon.vim.copypaste vim82/src/testdir/test_balloon.vim
--- vim82/src/testdir/test_balloon.vim.copypaste	2022-01-24 12:15:41.051120576 +0100
+++ vim82/src/testdir/test_balloon.vim	2022-01-24 12:17:02.604372440 +0100
@@ -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 -up vim82/src/testdir/test_popupwin.vim.copypaste vim82/src/testdir/test_popupwin.vim
--- vim82/src/testdir/test_popupwin.vim.copypaste	2022-01-24 12:13:44.000000000 +0100
+++ vim82/src/testdir/test_popupwin.vim	2022-01-24 12:18:24.382624989 +0100
@@ -553,6 +553,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_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 }}}")
@@ -678,6 +680,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',
@@ -1513,6 +1516,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
@@ -2218,6 +2222,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',