To: vim_dev@googlegroups.com Subject: Patch 7.4.2253 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.2253 Problem: Check for Windows 3.1 will always return false. (Christian Brabandt) Solution: Remove the dead code. Files: src/gui_w32.c, src/evalfunc.c, src/ex_cmds.c, src/option.c, src/os_win32.c, src/version.c, src/proto/gui_w32.pro *** ../vim-7.4.2252/src/gui_w32.c 2016-08-22 23:04:29.218161596 +0200 --- src/gui_w32.c 2016-08-25 23:08:02.377927774 +0200 *************** *** 4533,4547 **** || (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. --- 4533,4538 ---- *** ../vim-7.4.2252/src/evalfunc.c 2016-08-24 22:11:52.333278018 +0200 --- src/evalfunc.c 2016-08-25 23:07:24.438292270 +0200 *************** *** 5989,5998 **** #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 */ --- 5989,5994 ---- *** ../vim-7.4.2252/src/ex_cmds.c 2016-08-24 22:11:52.333278018 +0200 --- src/ex_cmds.c 2016-08-25 23:07:49.702049703 +0200 *************** *** 1927,1937 **** #ifdef UNIX shortname, #else - # ifdef FEAT_GUI_W32 - gui_is_win32s(), - # else FALSE, - # endif #endif fname, #ifdef VMS --- 1927,1933 ---- *** ../vim-7.4.2252/src/option.c 2016-08-21 17:44:57.440487201 +0200 --- src/option.c 2016-08-25 23:09:39.628987778 +0200 *************** *** 3294,3309 **** } } - #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; --- 3294,3299 ---- *** ../vim-7.4.2252/src/os_win32.c 2016-08-17 21:31:54.441870400 +0200 --- src/os_win32.c 2016-08-25 23:10:17.944615428 +0200 *************** *** 2062,2068 **** Columns = 80; /* Look for 'vimrun' */ - if (!gui_is_win32s()) { char_u vimrun_location[_MAX_PATH + 4]; --- 2062,2067 ---- *************** *** 4142,4148 **** * 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()) si.wShowWindow = SW_SHOWMINNOACTIVE; else si.wShowWindow = SW_SHOWNORMAL; --- 4141,4147 ---- * 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()) si.wShowWindow = SW_SHOWMINNOACTIVE; else si.wShowWindow = SW_SHOWNORMAL; *** ../vim-7.4.2252/src/version.c 2016-08-25 23:02:08.541261676 +0200 --- src/version.c 2016-08-25 23:18:21.556388492 +0200 *************** *** 5419,5426 **** 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 --- 5421,5426 ---- *** ../vim-7.4.2252/src/proto/gui_w32.pro 2016-08-22 23:04:29.222161560 +0200 --- src/proto/gui_w32.pro 2016-08-25 23:08:18.669770852 +0200 *************** *** 62,68 **** 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); --- 62,67 ---- *** ../vim-7.4.2252/src/version.c 2016-08-25 23:02:08.541261676 +0200 --- src/version.c 2016-08-25 23:18:21.556388492 +0200 *************** *** 765,766 **** --- 765,768 ---- { /* Add new patch number below this line */ + /**/ + 2253, /**/ -- hundred-and-one symptoms of being an internet addict: 79. All of your most erotic dreams have a scrollbar at the right side. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///