Mercurial > vim
diff src/misc2.c @ 12477:68d7bc045dbe v8.0.1118
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
commit https://github.com/vim/vim/commit/4033c55eca575777718c0701e26635a0cc47d907
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Sep 16 20:54:51 2017 +0200
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Problem: FEAT_WINDOWS adds a lot of #ifdefs while it is nearly always
enabled and only adds 7% to the binary size of the tiny build.
Solution: Graduate FEAT_WINDOWS.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 16 Sep 2017 21:00:06 +0200 |
| parents | 57e0b701611e |
| children | 972ea22c946f |
line wrap: on
line diff
--- a/src/misc2.c +++ b/src/misc2.c @@ -169,9 +169,7 @@ coladvance2( if (finetune && curwin->w_p_wrap -# ifdef FEAT_WINDOWS && curwin->w_width != 0 -# endif && wcol >= (colnr_T)width) { csize = linetabsize(line); @@ -1084,14 +1082,12 @@ free_all_mem(void) block_autocmds(); # endif -# ifdef FEAT_WINDOWS /* Close all tabs and windows. Reset 'equalalways' to avoid redraws. */ p_ea = FALSE; if (first_tabpage->tp_next != NULL) do_cmdline_cmd((char_u *)"tabonly!"); if (!ONE_WINDOW) do_cmdline_cmd((char_u *)"only!"); -# endif # if defined(FEAT_SPELL) /* Free all spell info. */ @@ -1197,10 +1193,8 @@ free_all_mem(void) /* Close all script inputs. */ close_all_scripts(); -#if defined(FEAT_WINDOWS) /* Destroy all windows. Must come before freeing buffers. */ win_free_all(); -#endif /* Free all buffers. Reset 'autochdir' to avoid accessing things that * were freed already. */ @@ -1238,10 +1232,8 @@ free_all_mem(void) reset_last_sourcing(); -#ifdef FEAT_WINDOWS free_tabpage(first_tabpage); first_tabpage = NULL; -#endif # ifdef UNIX /* Machine-specific free. */ @@ -3176,11 +3168,9 @@ set_fileformat( set_string_option_direct((char_u *)"ff", -1, (char_u *)p, OPT_FREE | opt_flags, 0); -#ifdef FEAT_WINDOWS /* This may cause the buffer to become (un)modified. */ check_status(curbuf); redraw_tabline = TRUE; -#endif #ifdef FEAT_TITLE need_maketitle = TRUE; /* set window title later */ #endif @@ -3353,8 +3343,7 @@ same_directory(char_u *f1, char_u *f2) } #if defined(FEAT_SESSION) || defined(MSWIN) || defined(FEAT_GUI_MAC) \ - || ((defined(FEAT_GUI_GTK)) \ - && ( defined(FEAT_WINDOWS) || defined(FEAT_DND)) ) \ + || defined(FEAT_GUI_GTK) \ || defined(FEAT_SUN_WORKSHOP) || defined(FEAT_NETBEANS_INTG) \ || defined(PROTO) /* @@ -3728,10 +3717,8 @@ get_shape_idx(int mouse) } if (mouse && drag_status_line) return SHAPE_IDX_SDRAG; -# ifdef FEAT_WINDOWS if (mouse && drag_sep_line) return SHAPE_IDX_VDRAG; -# endif #endif if (!mouse && State == SHOWMATCH) return SHAPE_IDX_SM;