Mercurial > vim
comparison src/main.c @ 16596:2f86ca0c1e6b v8.1.1301
patch 8.1.1301: when compiled with VIMDLL some messages are not shown
commit https://github.com/vim/vim/commit/0b75f7c97cd7f2529884c48dca8edb02abda4bc5
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed May 8 22:28:46 2019 +0200
patch 8.1.1301: when compiled with VIMDLL some messages are not shown
Problem: When compiled with VIMDLL some messages are not shown.
Solution: Set/reset gui.in_use and gui.starting as needed. (Ken Takata,
closes #4361)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Wed, 08 May 2019 22:30:05 +0200 |
parents | 5256c1e27ea6 |
children | 7e733046db1d |
comparison
equal
deleted
inserted
replaced
16595:85a9352e3f45 | 16596:2f86ca0c1e6b |
---|---|
176 common_init(¶ms); | 176 common_init(¶ms); |
177 | 177 |
178 #ifdef VIMDLL | 178 #ifdef VIMDLL |
179 // Check if the current executable file is for the GUI subsystem. | 179 // Check if the current executable file is for the GUI subsystem. |
180 gui.starting = mch_is_gui_executable(); | 180 gui.starting = mch_is_gui_executable(); |
181 #elif defined(FEAT_GUI_MSWIN) | |
182 gui.starting = TRUE; | |
181 #endif | 183 #endif |
182 | 184 |
183 #ifdef FEAT_CLIENTSERVER | 185 #ifdef FEAT_CLIENTSERVER |
184 /* | 186 /* |
185 * Do the client-server stuff, unless "--servername ''" was used. | 187 * Do the client-server stuff, unless "--servername ''" was used. |
3238 int n, /* one of the ME_ defines */ | 3240 int n, /* one of the ME_ defines */ |
3239 char_u *str) /* extra argument or NULL */ | 3241 char_u *str) /* extra argument or NULL */ |
3240 { | 3242 { |
3241 #if defined(UNIX) || defined(VMS) | 3243 #if defined(UNIX) || defined(VMS) |
3242 reset_signals(); /* kill us with CTRL-C here, if you like */ | 3244 reset_signals(); /* kill us with CTRL-C here, if you like */ |
3245 #endif | |
3246 | |
3247 // If this is a Windows GUI executable, show an error dialog box. | |
3248 #ifdef VIMDLL | |
3249 gui.in_use = mch_is_gui_executable(); | |
3250 #endif | |
3251 #ifdef FEAT_GUI_MSWIN | |
3252 gui.starting = FALSE; // Needed to show as error. | |
3243 #endif | 3253 #endif |
3244 | 3254 |
3245 init_longVersion(); | 3255 init_longVersion(); |
3246 mch_errmsg(longVersion); | 3256 mch_errmsg(longVersion); |
3247 mch_errmsg("\n"); | 3257 mch_errmsg("\n"); |