Zdenek Dohnal 1b2fae
diff --git a/runtime/defaults.vim b/runtime/defaults.vim
Zdenek Dohnal 1b2fae
index f3c639b..20637e2 100644
Zdenek Dohnal 1b2fae
--- a/runtime/defaults.vim
Zdenek Dohnal 1b2fae
+++ b/runtime/defaults.vim
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 1b2fae
diff --git a/src/testdir/test_balloon.vim b/src/testdir/test_balloon.vim
Zdenek Dohnal 1b2fae
index 319e546..8fcf63c 100644
Zdenek Dohnal 1b2fae
--- a/src/testdir/test_balloon.vim
Zdenek Dohnal 1b2fae
+++ b/src/testdir/test_balloon.vim
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 1b2fae
   set balloonevalterm balloonexpr=MyBalloonExpr() balloondelay=100
Zdenek Dohnal 1b2fae
   func MyBalloonExpr()
Zdenek Dohnal 1b2fae
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
Zdenek Dohnal 1b2fae
index f13252b..ec755a4 100644
Zdenek Dohnal 1b2fae
--- a/src/testdir/test_popupwin.vim
Zdenek Dohnal 1b2fae
+++ b/src/testdir/test_popupwin.vim
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 1b2fae
@@ -599,6 +600,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 1b2fae
+  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 1b2fae
@@ -652,6 +654,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 1b2fae
@@ -1479,6 +1482,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 1b2fae
@@ -2170,6 +2174,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',