diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-08-26 17:53:44 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-08-26 17:53:44 +0100 |
| commit | 2ee347fbc0619179fefb9933e9bb1165463507b3 (patch) | |
| tree | 9c66f20830efdc90cb227601caa725a2e2cf56f6 /src/feature.h | |
| parent | 5416232707349d5f24294178f47544f2024b73ed (diff) | |
patch 9.0.0280: the builtin termcap list depends on the versionv9.0.0280
Problem: The builtin termcap list depends on the version.
Solution: Always include all termcap entries. Remove duplicate lines.
Diffstat (limited to 'src/feature.h')
| -rw-r--r-- | src/feature.h | 40 |
1 files changed, 7 insertions, 33 deletions
diff --git a/src/feature.h b/src/feature.h index ebd5dbc252..f1a7af8dff 100644 --- a/src/feature.h +++ b/src/feature.h @@ -120,6 +120,7 @@ * +path_extra up/downwards searching in 'path' and 'tags'. * +wildignore 'wildignore' and 'backupskip' options * +wildmenu 'wildmenu' option + * +builtin_terms all builtin termcap entries included * * Obsolete: * +tag_old_static Old style static tags: "file:tag file ..". @@ -375,37 +376,17 @@ #endif /* - * +builtin_terms Choose one out of the following four: - * - * NO_BUILTIN_TCAPS Do not include any builtin termcap entries (used only - * with HAVE_TGETENT defined). - * - * (nothing) Machine specific termcap entries will be included. - * - * SOME_BUILTIN_TCAPS Include most useful builtin termcap entries (used only - * with NO_BUILTIN_TCAPS not defined). - * This is the default. - * - * ALL_BUILTIN_TCAPS Include all builtin termcap entries - * (used only with NO_BUILTIN_TCAPS not defined). + * +cryptv Encryption (originally by Mohsin Ahmed <mosh@sasi.com>). */ -#ifdef HAVE_TGETENT -// #define NO_BUILTIN_TCAPS -#endif - -#if !defined(NO_BUILTIN_TCAPS) -# ifdef FEAT_BIG -# define ALL_BUILTIN_TCAPS -# else -# define SOME_BUILTIN_TCAPS // default -# endif +#if defined(FEAT_NORMAL) && !defined(FEAT_CRYPT) || defined(PROTO) +# define FEAT_CRYPT #endif /* - * +cryptv Encryption (by Mohsin Ahmed <mosh@sasi.com>). + * libsodium - add cryptography support */ -#if defined(FEAT_NORMAL) && !defined(FEAT_CRYPT) || defined(PROTO) -# define FEAT_CRYPT +#if defined(HAVE_SODIUM) && defined(FEAT_BIG) +# define FEAT_SODIUM #endif /* @@ -514,13 +495,6 @@ # define FEAT_SOUND_CANBERRA #endif -/* - * libsodium - add cryptography support - */ -#if defined(HAVE_SODIUM) && defined(FEAT_BIG) -# define FEAT_SODIUM -#endif - // There are two ways to use XPM. #if (defined(HAVE_XM_XPMP_H) && defined(FEAT_GUI_MOTIF)) \ || defined(HAVE_X11_XPM_H) |