patch 8.1.1630: various small problems

Problem:    Various small problems.
Solution:   Various small improvements.

diff --git a/src/gui_beval.c b/src/gui_beval.c
index f4309b8c33bcac81dfc21977dcebf2b6ad156878..68d30e35fbbc4382f40dedc3d0d35a955c8e9d29 100644 (file)
--- a/src/gui_beval.c
+++ b/src/gui_beval.c
@@ -107,7 +107,7 @@ gui_mch_create_beval_area(
        return NULL;
     }
 
-    beval = (BalloonEval *)alloc_clear(sizeof(BalloonEval));
+    beval = ALLOC_CLEAR_ONE(BalloonEval);
     if (beval != NULL)
     {
 #ifdef FEAT_GUI_GTK

diff --git a/src/list.c b/src/list.c
index e7a4f99418a0b0dc9068e861cfab318bfdf15934..e1aa2d1a00ae83f83986197fc7765208094db1f2 100644 (file)
--- a/src/list.c
+++ b/src/list.c
@@ -130,7 +130,7 @@ rettv_list_alloc_id(typval_T *rettv, alloc_id_T id UNUSED)
 
 
 /*
- * Set a list as the return value
+ * Set a list as the return value.  Increments the reference count.
  */
     void
 rettv_list_set(typval_T *rettv, list_T *l)

diff --git a/src/menu.c b/src/menu.c
index f32fe4992d00204c2da792b7433d7a4a8e133287..5cdf501446013604c06a8448b8cbd4e633e8b199 100644 (file)
--- a/src/menu.c
+++ b/src/menu.c
@@ -583,7 +583,7 @@ add_menu_path(
            }
 
            /* Not already there, so lets add it */
-           menu = (vimmenu_T *)alloc_clear(sizeof(vimmenu_T));
+           menu = ALLOC_CLEAR_ONE(vimmenu_T);
            if (menu == NULL)
                goto erret;
 

diff --git a/src/message.c b/src/message.c
index 26a3e3adae148fa9b0e87715bcbe47a20e21ba63..c5e73ba4823087dedbc2311dfe4ee7767927108e 100644 (file)
--- a/src/message.c
+++ b/src/message.c
@@ -652,7 +652,7 @@ emsg_core(char_u *s)
                redir_write(s, -1);
            }
 #ifdef FEAT_JOB_CHANNEL
-           ch_log(NULL, "ERROR: %s", (char *)s);
+           ch_log(NULL, "ERROR silent: %s", (char *)s);
 #endif
            return TRUE;
        }

diff --git a/src/misc2.c b/src/misc2.c
index d1615b1d104811dd971e0ab14f6e9d5d44eff84b..be9233f5ba16e70e80817403cf9c15711637b41c 100644 (file)
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -1193,9 +1193,7 @@ free_all_mem(void)
            buf = firstbuf;
     }
 
-# ifdef FEAT_ARABIC
     free_cmdline_buf();
-# endif
 
     /* Clear registers. */
     clear_registers();

diff --git a/src/os_vms_conf.h b/src/os_vms_conf.h
index 6bc6efb34640dcabf30ebeba9453391852b8f794..7588caebfe359fab9fc2440b8fd6a9ddd0b09bf8 100644 (file)
--- a/src/os_vms_conf.h
+++ b/src/os_vms_conf.h
@@ -24,7 +24,7 @@
 #define HAVE_DATE_TIME
 
 /* Defined to the size of an int */
-#define VIM_SIZEOF_INT  4 
+#define VIM_SIZEOF_INT  4
 
 /* #undef USEBCOPY */
 #define USEMEMMOVE

diff --git a/src/testdir/Make_vms.mms b/src/testdir/Make_vms.mms
index 88aff09e1f19556a8b1d9c8f02ad68f12e5cb38b..bb30618f9f070ff007b38e9515c435dd077315db 100644 (file)
--- 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 cdaa941004adb94576cb4c1b49811798450f2791..fa9eb1e996c088c41f6a24977e3fb48591836527 100644 (file)
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -1187,11 +1187,10 @@ func Test_terminal_dumpdiff_options()
   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
 

diff --git a/src/version.c b/src/version.c
index 258605bad28eaa1b7402135c89e5ed042ce45e18..90f8e0853af89f91c7aeae2779f2c1df1b89a4df 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -777,6 +777,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1630,
 /**/
     1629,
 /**/