Mercurial > vim
diff src/feature.h @ 29883:1342ee83ab97 v9.0.0280
patch 9.0.0280: the builtin termcap list depends on the version
Commit: https://github.com/vim/vim/commit/2ee347fbc0619179fefb9933e9bb1165463507b3
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Aug 26 17:53:44 2022 +0100
patch 9.0.0280: the builtin termcap list depends on the version
Problem: The builtin termcap list depends on the version.
Solution: Always include all termcap entries. Remove duplicate lines.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 26 Aug 2022 19:00:07 +0200 |
| parents | 0cc9a3001717 |
| children | a6721cafbc74 |
line wrap: on
line diff
--- 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)