Zdenek Dohnal 380067
diff -up vim82/runtime/defaults.vim.copypaste vim82/runtime/defaults.vim
Zdenek Dohnal 380067
--- vim82/runtime/defaults.vim.copypaste	2022-01-24 12:13:43.000000000 +0100
Zdenek Dohnal 380067
+++ vim82/runtime/defaults.vim	2022-01-24 12:15:41.050120573 +0100
Zdenek Dohnal 1b2fae
@@ -73,18 +73,6 @@ map Q gq
Zdenek Dohnal 1b2fae
 " Revert with ":iunmap <C-U>".
Zdenek Dohnal 1b2fae
 inoremap <C-U> <C-G>u<C-U>
Zdenek Dohnal 1b2fae
 
Zdenek Dohnal 1b2fae
-" In many terminal emulators the mouse works just fine.  By enabling it you
Zdenek Dohnal 1b2fae
-" can position the cursor, Visually select and scroll with the mouse.
Zdenek Dohnal 1b2fae
-" Only xterm can grab the mouse events when using the shift key, for other
Zdenek Dohnal 1b2fae
-" terminals use ":", select text and press Esc.
Zdenek Dohnal 1b2fae
-if has('mouse')
Zdenek Dohnal 1b2fae
-  if &term =~ 'xterm'
Zdenek Dohnal 1b2fae
-    set mouse=a
Zdenek Dohnal 1b2fae
-  else
Zdenek Dohnal 1b2fae
-    set mouse=nvi
Zdenek Dohnal 1b2fae
-  endif
Zdenek Dohnal 1b2fae
-endif
Zdenek Dohnal 1b2fae
-
Zdenek Dohnal 1b2fae
 " Only do this part when Vim was compiled with the +eval feature.
Zdenek Dohnal 1b2fae
 if 1
Zdenek Dohnal 1b2fae
 
Zdenek Dohnal 380067
diff -up vim82/src/testdir/test_balloon.vim.copypaste vim82/src/testdir/test_balloon.vim
Zdenek Dohnal 380067
--- vim82/src/testdir/test_balloon.vim.copypaste	2022-01-24 12:15:41.051120576 +0100
Zdenek Dohnal 380067
+++ vim82/src/testdir/test_balloon.vim	2022-01-24 12:17:02.604372440 +0100
Zdenek Dohnal 1b2fae
@@ -9,6 +9,7 @@ source screendump.vim
Zdenek Dohnal 1b2fae
 CheckScreendump
Zdenek Dohnal 1b2fae
 
Zdenek Dohnal 1b2fae
 let s:common_script =<< trim [CODE]
Zdenek Dohnal 1b2fae
+  set mouse=a
Zdenek Dohnal 1b2fae
   call setline(1, ["one one one", "two tXo two", "three three three"])
Zdenek Dohnal 380067
   set balloonevalterm balloonexpr=MyBalloonExpr()..s:trailing balloondelay=100
Zdenek Dohnal 380067
   let s:trailing = '<'  " check that script context is set
Zdenek Dohnal 380067
diff -up vim82/src/testdir/test_popupwin.vim.copypaste vim82/src/testdir/test_popupwin.vim
Zdenek Dohnal 380067
--- vim82/src/testdir/test_popupwin.vim.copypaste	2022-01-24 12:13:44.000000000 +0100
Zdenek Dohnal 380067
+++ vim82/src/testdir/test_popupwin.vim	2022-01-24 12:18:24.382624989 +0100
Zdenek Dohnal 1b2fae
@@ -553,6 +553,7 @@ func Test_popup_drag()
Zdenek Dohnal 1b2fae
   " create a popup that covers the command line
Zdenek Dohnal 1b2fae
   let lines =<< trim END
Zdenek Dohnal 1b2fae
 	call setline(1, range(1, 20))
Zdenek Dohnal 1b2fae
+	set mouse=a
Zdenek Dohnal 1b2fae
 	split
Zdenek Dohnal 1b2fae
 	vsplit
Zdenek Dohnal 1b2fae
 	$wincmd w
Zdenek Dohnal 380067
@@ -625,6 +626,7 @@ func Test_popup_drag_termwin()
Zdenek Dohnal 1b2fae
   let lines =<< trim END
Zdenek Dohnal 1b2fae
 	set foldmethod=marker
Zdenek Dohnal 1b2fae
 	call setline(1, range(100))
Zdenek Dohnal 380067
+	set mouse=a
Zdenek Dohnal 1b2fae
 	for nr in range(7)
Zdenek Dohnal 1b2fae
 	  call setline(nr * 12 + 1, "fold {{{")
Zdenek Dohnal 1b2fae
 	  call setline(nr * 12 + 11, "end }}}")
Zdenek Dohnal 380067
@@ -678,6 +680,7 @@ func Test_popup_close_with_mouse()
Zdenek Dohnal 1b2fae
 
Zdenek Dohnal 1b2fae
   let lines =<< trim END
Zdenek Dohnal 1b2fae
 	call setline(1, range(1, 20))
Zdenek Dohnal 1b2fae
+	set mouse=a
Zdenek Dohnal 1b2fae
 	" With border, can click on X
Zdenek Dohnal 1b2fae
 	let winid = popup_create('foobar', #{
Zdenek Dohnal 1b2fae
 	      \ close: 'button',
Zdenek Dohnal 380067
@@ -1513,6 +1516,7 @@ func Test_popup_beval()
Zdenek Dohnal 1b2fae
   let lines =<< trim END
Zdenek Dohnal 1b2fae
 	call setline(1, range(1, 20))
Zdenek Dohnal 1b2fae
 	call setline(5, 'here is some text to hover over')
Zdenek Dohnal 1b2fae
+	set mouse=a
Zdenek Dohnal 1b2fae
 	set balloonevalterm
Zdenek Dohnal 1b2fae
 	set balloonexpr=BalloonExpr()
Zdenek Dohnal 1b2fae
 	set balloondelay=100
Zdenek Dohnal 380067
@@ -2218,6 +2222,7 @@ func Test_popup_scrollbar()
Zdenek Dohnal 1b2fae
 
Zdenek Dohnal 1b2fae
   let lines =<< trim END
Zdenek Dohnal 1b2fae
     call setline(1, range(1, 20))
Zdenek Dohnal 1b2fae
+    set mouse=a
Zdenek Dohnal 1b2fae
     hi ScrollThumb ctermbg=blue
Zdenek Dohnal 1b2fae
     hi ScrollBar ctermbg=red
Zdenek Dohnal 1b2fae
     let winid = popup_create(['one', 'two', 'three', 'four', 'five',