diff options
| author | Martin Tournoij <martin@arp242.net> | 2022-10-04 16:28:45 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-10-04 16:28:45 +0100 |
| commit | 7904fa420eb577274c4c3711295240100167d495 (patch) | |
| tree | a38ab30cb4c947c2ebba45cd7ed711ffd2e719a7 /src/feature.h | |
| parent | 4ba5f1dab656103e8f4a4505452d1816b9e83c1e (diff) | |
patch 9.0.0657: too many #ifdefsv9.0.0657
Problem: Too many #ifdefs.
Solution: Graduate the +cmdwin feature. Now the tiny and small builds are
equal, drop the small build. (Martin Tournoij, closes #11268)
Diffstat (limited to 'src/feature.h')
| -rw-r--r-- | src/feature.h | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/src/feature.h b/src/feature.h index 5eacd5e953..bc259fd562 100644 --- a/src/feature.h +++ b/src/feature.h @@ -31,23 +31,31 @@ * Basic choices: * ============== * - * +tiny almost no features enabled, not even multiple windows - * +small as tiny plus cmdline window - * +normal A default selection of features enabled - * +big many features enabled, as rich as possible. + * +tiny no optional features enabled, not even +eval + * +normal a default selection of features enabled + * +big many features enabled, except "expensive" ones * +huge all possible features enabled. * - * When +small is used, +tiny is also included. +normal implies +small, etc. + * When +normal is used, +tiny is also included. +big implies +normal, etc. */ /* + * +small is now an alias for +tiny + */ +#if defined(FEAT_SMALL) +# undef FEAT_SMALL +# if !defined(FEAT_TINY) +# define FEAT_TINY +# endif +#endif + +/* * Uncomment one of these to override the default. For unix use a configure * argument, see Makefile. */ -#if !defined(FEAT_TINY) && !defined(FEAT_SMALL) && !defined(FEAT_NORMAL) \ +#if !defined(FEAT_TINY) && !defined(FEAT_NORMAL) \ && !defined(FEAT_BIG) && !defined(FEAT_HUGE) // #define FEAT_TINY -// #define FEAT_SMALL // #define FEAT_NORMAL // #define FEAT_BIG // #define FEAT_HUGE @@ -59,7 +67,7 @@ * Use +big for older systems: VMS and Amiga. * Otherwise use +normal */ -#if !defined(FEAT_TINY) && !defined(FEAT_SMALL) && !defined(FEAT_NORMAL) \ +#if !defined(FEAT_TINY) && !defined(FEAT_NORMAL) \ && !defined(FEAT_BIG) && !defined(FEAT_HUGE) # if defined(UNIX) || defined(MSWIN) || defined(MACOS_X) # define FEAT_HUGE @@ -82,9 +90,6 @@ # define FEAT_NORMAL #endif #ifdef FEAT_NORMAL -# define FEAT_SMALL -#endif -#ifdef FEAT_SMALL # define FEAT_TINY #endif @@ -122,6 +127,7 @@ * +wildmenu 'wildmenu' option * +builtin_terms all builtin termcap entries included * +float Floating point variables. + * +cmdwin Command line window. * * Obsolete: * +tag_old_static Old style static tags: "file:tag file ..". @@ -137,10 +143,6 @@ */ #define MAX_MSG_HIST_LEN 200 -#if defined(FEAT_SMALL) -# define FEAT_CMDWIN -#endif - /* * +folding Fold lines. */ @@ -915,7 +917,7 @@ # define FEAT_DND #endif -#if defined(FEAT_GUI_MSWIN) && defined(FEAT_SMALL) +#if defined(FEAT_GUI_MSWIN) # define MSWIN_FIND_REPLACE // include code for find/replace dialog # define MSWIN_FR_BUFSIZE 256 #endif |