patch 8.1.1630: various small problems

Problem:    Various small problems.
Solution:   Various small improvements.
diff --git a/src/testdir/Make_vms.mms b/src/testdir/Make_vms.mms
index 88aff09..bb30618 100644
--- a/src/testdir/Make_vms.mms
+++ b/src/testdir/Make_vms.mms
@@ -4,7 +4,7 @@
 # Authors:	Zoltan Arpadffy, <arpadffy@polarhome.com>
 #		Sandor Kopanyi,  <sandor.kopanyi@mailbox.hu>
 #
-# Last change:  2016 Nov 04
+# Last change:  2019 May 31
 #
 # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
 # Edit the lines in the Configuration section below to select.
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index cdaa941..fa9eb1e 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -1187,11 +1187,10 @@
   quit
 
   call assert_equal(1, winnr('$'))
-  let width = winwidth(0)
   call term_dumpdiff('dumps/Test_popup_command_01.dump', 'dumps/Test_popup_command_02.dump', {'vertical': 0, 'term_rows': 13, 'term_name': 'something else'})
   call assert_equal(2, winnr('$'))
-  call assert_equal(width, winwidth(winnr()))
-  call assert_equal(13, winheight(winnr()))
+  call assert_equal(&columns, winwidth(0))
+  call assert_equal(13, winheight(0))
   call assert_equal('something else', bufname('%'))
   quit