diff options
| author | Bram Moolenaar <Bram@vim.org> | 2007-05-04 20:29:09 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2007-05-04 20:29:09 +0000 |
| commit | aea02fa475b078aa6e4e714109ff2e8323fc2591 (patch) | |
| tree | 16c1b36d808c9baadedea01b492c7a720f8bf232 | |
| parent | 4142324d253f27f9a9179509fab10f9986032bcb (diff) | |
updated for version 7.0-242v7.0.242
| -rw-r--r-- | src/gui_w32.c | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/gui_w32.c b/src/gui_w32.c index edb0be404f..1fda67b779 100644 --- 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 90ba544cb3..ef00f49a68 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 242, +/**/ 241, /**/ 240, |