updated for version 7.0-242

diff --git a/src/gui_w32.c b/src/gui_w32.c
index edb0be404fa8e35ffd61887d78a5e55471dbdc58..1fda67b7792cce8d039493721528c9800e6ee343 100644 (file)
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -1140,8 +1140,13 @@ gui_mch_set_parent(char *title)
     static void
 ole_error(char *arg)
 {
-    EMSG2(_("E243: Argument not supported: \"-%s\"; Use the OLE version."),
-                                                                        arg);
+    char buf[IOSIZE];
+
+    /* Can't use EMSG() here, we have not finished initialisation yet. */
+    vim_snprintf(buf, IOSIZE,
+           _("E243: Argument not supported: \"-%s\"; Use the OLE version."),
+           arg);
+    mch_errmsg(buf);
 }
 #endif
 
@@ -3164,8 +3169,9 @@ gui_mch_dialog(
 
     /*
      * Check button names.  A long one will make the dialog wider.
+     * When called early (-register error message) p_go isn't initialized.
      */
-    vertical = (vim_strchr(p_go, GO_VERTICAL) != NULL);
+    vertical = (p_go != NULL && vim_strchr(p_go, GO_VERTICAL) != NULL);
     if (!vertical)
     {
        // Place buttons horizontally if they fit.

diff --git a/src/version.c b/src/version.c
index 90ba544cb3d486cdfc24ca916312f59b086b67fd..ef00f49a68afa6da2056a8372a8b70b28b3b02dc 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    242,
 /**/
     241,
 /**/