diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/errors.h | 4 | ||||
| -rw-r--r-- | src/gui_w32.c | 4 | ||||
| -rw-r--r-- | src/os_win32.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 10 insertions, 6 deletions
diff --git a/src/errors.h b/src/errors.h index 050cec768d..43baa6a1ad 100644 --- a/src/errors.h +++ b/src/errors.h @@ -2011,11 +2011,11 @@ EXTERN char e_cannot_delete_variable[] INIT(= N_("E795: Cannot delete variable")); EXTERN char e_cannot_delete_variable_str[] INIT(= N_("E795: Cannot delete variable %s")); +#endif +#ifdef MSWIN // E796 -# ifdef MSWIN EXTERN char e_writing_to_device_disabled_with_opendevice_option[] INIT(= N_("writing to device disabled with 'opendevice' option")); -# endif #endif #ifdef FEAT_SPELL EXTERN char e_spellfilemising_autocommand_deleted_buffer[] diff --git a/src/gui_w32.c b/src/gui_w32.c index 8ae0cd069b..203b8fa548 100644 --- a/src/gui_w32.c +++ b/src/gui_w32.c @@ -198,9 +198,7 @@ gui_mch_set_rendering_options(char_u *s) # ifndef __MINGW32__ # include <shellapi.h> # endif -# if defined(FEAT_TOOLBAR) || defined(FEAT_BEVAL_GUI) || defined(FEAT_GUI_TABLINE) -# include <commctrl.h> -# endif +# include <commctrl.h> # include <windowsx.h> #endif // PROTO diff --git a/src/os_win32.c b/src/os_win32.c index d936e4f087..af2622caeb 100644 --- a/src/os_win32.c +++ b/src/os_win32.c @@ -2834,7 +2834,11 @@ SaveConsoleTitleAndIcon(void) return; // Extract the first icon contained in the Vim executable. - if (mch_icon_load((HANDLE *)&g_hVimIcon) == FAIL || g_hVimIcon == NULL) + if ( +# ifdef FEAT_LIBCALL + mch_icon_load((HANDLE *)&g_hVimIcon) == FAIL || +# endif + g_hVimIcon == NULL) g_hVimIcon = ExtractIcon(NULL, (LPCSTR)exe_name, 0); if (g_hVimIcon != NULL) g_fCanChangeIcon = TRUE; diff --git a/src/version.c b/src/version.c index 29483f3060..cd340b5268 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 436, +/**/ 435, /**/ 434, |