Mercurial > vim
changeset 9959:b9fd9c50be25 v7.4.2253
commit https://github.com/vim/vim/commit/78c7e274f27c68bf86b0a68411b128c6945d1f6a
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Aug 25 23:19:29 2016 +0200
patch 7.4.2253
Problem: Check for Windows 3.1 will always return false. (Christian
Brabandt)
Solution: Remove the dead code.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 25 Aug 2016 23:30:05 +0200 |
| parents | 7609ef13f0a7 |
| children | e745508cf14b |
| files | src/evalfunc.c src/ex_cmds.c src/gui_w32.c src/option.c src/os_win32.c src/proto/gui_w32.pro src/version.c |
| diffstat | 7 files changed, 3 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -5989,10 +5989,6 @@ f_has(typval_T *argvars, typval_T *rettv #ifdef FEAT_GUI else if (STRICMP(name, "gui_running") == 0) n = (gui.in_use || gui.starting); -# ifdef FEAT_GUI_W32 - else if (STRICMP(name, "gui_win32s") == 0) - n = gui_is_win32s(); -# endif # ifdef FEAT_BROWSE else if (STRICMP(name, "browse") == 0) n = gui.in_use; /* gui_mch_browse() works when GUI is running */
--- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -1927,11 +1927,7 @@ write_viminfo(char_u *file, int forceit) #ifdef UNIX shortname, #else -# ifdef FEAT_GUI_W32 - gui_is_win32s(), -# else FALSE, -# endif #endif fname, #ifdef VMS
--- a/src/gui_w32.c +++ b/src/gui_w32.c @@ -4533,15 +4533,6 @@ is_winnt_3(void) || (os_version.dwPlatformId == VER_PLATFORM_WIN32s)); } -/* - * Return TRUE when running under Win32s. - */ - int -gui_is_win32s(void) -{ - return (os_version.dwPlatformId == VER_PLATFORM_WIN32s); -} - #ifdef FEAT_MENU /* * Figure out how high the menu bar is at the moment.
--- a/src/option.c +++ b/src/option.c @@ -3294,16 +3294,6 @@ set_init_1(void) } } -#ifdef FEAT_GUI_W32 - /* force 'shortname' for Win32s */ - if (gui_is_win32s()) - { - opt_idx = findoption((char_u *)"shortname"); - if (opt_idx >= 0) - options[opt_idx].def_val[VI_DEFAULT] = (char_u *)TRUE; - } -#endif - #ifdef FEAT_SEARCHPATH { char_u *cdpath;
--- a/src/os_win32.c +++ b/src/os_win32.c @@ -2062,7 +2062,6 @@ mch_init(void) Columns = 80; /* Look for 'vimrun' */ - if (!gui_is_win32s()) { char_u vimrun_location[_MAX_PATH + 4]; @@ -4142,7 +4141,7 @@ mch_system_classic(char *cmd, int option * Win32s either as it stops the synchronous spawn workaround working. * Don't activate the window to keep focus on Vim. */ - if ((options & SHELL_DOOUT) && !mch_windows95() && !gui_is_win32s()) + if ((options & SHELL_DOOUT) && !mch_windows95()) si.wShowWindow = SW_SHOWMINNOACTIVE; else si.wShowWindow = SW_SHOWNORMAL;
--- a/src/proto/gui_w32.pro +++ b/src/proto/gui_w32.pro @@ -62,7 +62,6 @@ void mch_set_mouse_shape(int shape); char_u *gui_mch_browsedir(char_u *title, char_u *initdir); char_u *gui_mch_browse(int saving, char_u *title, char_u *dflt, char_u *ext, char_u *initdir, char_u *filter); int get_cmd_args(char *prog, char *cmdline, char ***argvp, char **tofree); -int gui_is_win32s(void); void gui_mch_set_parent(char *title); void gui_mch_prepare(int *argc, char **argv); int gui_mch_init(void);
--- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2253, +/**/ 2252, /**/ 2251, @@ -5419,8 +5421,6 @@ list_version(void) MSG_PUTS(_("\nMS-Windows 32-bit GUI version")); # endif # endif - if (gui_is_win32s()) - MSG_PUTS(_(" in Win32s mode")); # ifdef FEAT_OLE MSG_PUTS(_(" with OLE support")); # endif