Patch 9.0.0280

[Bram Moolenaar]

Patch 9.0.0280
Problem: The builtin termcap list depends on the version.
Solution: Always include all termcap entries. Remove duplicate lines.
Files: runtime/doc/builtin.txt, runtime/doc/term.txt,
runtime/doc/various.txt, src/feature.h, src/term.c,
src/evalfunc.c, src/version.c


*** ../vim-9.0.0279/runtime/doc/builtin.txt 2022-08-25 17:39:26.805017714 +0100
--- runtime/doc/builtin.txt 2022-08-26 17:47:39.410781835 +0100
***************
*** 10480,10486 ****


acl Compiled with |ACL| support.
! all_builtin_terms Compiled with all builtin terminals enabled.
amiga Amiga version of Vim.
arabic Compiled with Arabic support |Arabic|.
arp Compiled with ARP support (Amiga).
--- 10491,10498 ----


acl Compiled with |ACL| support.
! all_builtin_terms Compiled with all builtin terminals enabled. (always
! true)
amiga Amiga version of Vim.
arabic Compiled with Arabic support |Arabic|.
arp Compiled with ARP support (Amiga).
***************
*** 10494,10500 ****
work.
browsefilter Compiled with support for |browsefilter|.
bsd Compiled on an OS in the BSD family (excluding macOS).
! builtin_terms Compiled with some builtin terminals.
byte_offset Compiled with support for 'o' in 'statusline'
channel Compiled with support for |channel| and |job|
cindent Compiled with 'cindent' support. (always true)
--- 10506,10512 ----
work.
browsefilter Compiled with support for |browsefilter|.
bsd Compiled on an OS in the BSD family (excluding macOS).
! builtin_terms Compiled with some builtin terminals. (always true)
byte_offset Compiled with support for 'o' in 'statusline'
channel Compiled with support for |channel| and |job|
cindent Compiled with 'cindent' support. (always true)
*** ../vim-9.0.0279/runtime/doc/term.txt 2022-06-29 18:39:05.011841452 +0100
--- runtime/doc/term.txt 2022-08-26 17:50:09.682605788 +0100
***************
*** 43,57 ****
TERMCAP defined.

*builtin-terms* *builtin_terms*
! Which builtin terminals are available depends on a few defines in feature.h,
! which need to be set at compile time:
! define output of ":version" terminals builtin ~
! NO_BUILTIN_TCAPS -builtin_terms none
! SOME_BUILTIN_TCAPS +builtin_terms most common ones (default)
! ALL_BUILTIN_TCAPS ++builtin_terms all available
!
! You can see a list of available builtin terminals with ":set term=xxx" (when
! not running the GUI). Also see |+builtin_terms|.

If the termcap code is included Vim will try to get the strings for the
terminal you are using from the termcap file and the builtin termcaps. Both
--- 43,52 ----
TERMCAP defined.

*builtin-terms* *builtin_terms*
! A number of builtin terminals are available. Since patch 9.0.0280 there is no
! difference between Vim versions. You can see a list of available builtin
! terminals in the error message you get for `:set term=xxx` (when not running
! the GUI). Also see |+builtin_terms|.

If the termcap code is included Vim will try to get the strings for the
terminal you are using from the termcap file and the builtin termcaps. Both
*** ../vim-9.0.0279/runtime/doc/various.txt 2022-08-26 16:58:46.135489352 +0100
--- runtime/doc/various.txt 2022-08-26 17:51:13.958526216 +0100
***************
*** 342,349 ****
H *+balloon_eval_term* |balloon-eval| support in the terminal,
'balloonevalterm'
N *+browse* |:browse| command
! N *+builtin_terms* some terminals builtin |builtin-terms|
! B *++builtin_terms* maximal terminals builtin |builtin-terms|
N *+byte_offset* support for 'o' flag in 'statusline' option, "go"
and ":goto" commands.
m *+channel* inter process communication |channel|
--- 342,349 ----
H *+balloon_eval_term* |balloon-eval| support in the terminal,
'balloonevalterm'
N *+browse* |:browse| command
! T *++builtin_terms* maximal terminals builtin |builtin-terms| Always
! enabled since 9.0.0280
N *+byte_offset* support for 'o' flag in 'statusline' option, "go"
and ":goto" commands.
m *+channel* inter process communication |channel|
*** ../vim-9.0.0279/src/feature.h 2022-08-26 16:58:46.135489352 +0100
--- src/feature.h 2022-08-26 17:38:24.863222348 +0100
***************
*** 120,125 ****
--- 120,126 ----
* +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,411 ****
#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).
*/
! #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
#endif

/*
! * +cryptv Encryption (by Mohsin Ahmed <mo...@sasi.com>).
*/
! #if defined(FEAT_NORMAL) && !defined(FEAT_CRYPT) || defined(PROTO)
! # define FEAT_CRYPT
#endif

/*
--- 376,392 ----
#endif

/*
! * +cryptv Encryption (originally by Mohsin Ahmed <mo...@sasi.com>).
*/
! #if defined(FEAT_NORMAL) && !defined(FEAT_CRYPT) || defined(PROTO)
! # define FEAT_CRYPT
#endif

/*
! * libsodium - add cryptography support
*/
! #if defined(HAVE_SODIUM) && defined(FEAT_BIG)
! # define FEAT_SODIUM
#endif

/*
***************
*** 514,526 ****
# 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)
--- 495,500 ----
*** ../vim-9.0.0279/src/term.c 2022-08-26 12:26:04.546865218 +0100
--- src/term.c 2022-08-26 17:24:17.243357367 +0100
***************
*** 223,229 ****
*/
static struct builtin_term builtin_termcaps[] =
{
-
#if defined(FEAT_GUI)
/*
* GUI pseudo term-cap.
--- 223,228 ----
***************
*** 276,284 ****
// in check_termcode()
#endif

- #ifndef NO_BUILTIN_TCAPS
-
- # if defined(AMIGA) || defined(ALL_BUILTIN_TCAPS)
/*
* Amiga console window, default for Amiga
*/
--- 275,280 ----
***************
*** 376,446 ****
{TERMCAP2KEY('#', '2'), "\233\065\064~"}, // shifted home key
{TERMCAP2KEY('#', '3'), "\233\065\060~"}, // shifted insert key
{TERMCAP2KEY('*', '7'), "\233\065\065~"}, // shifted end key
- # endif

- # ifdef ALL_BUILTIN_TCAPS
- /*
- * almost standard ANSI terminal
- */
- {(int)KS_CE, "\033[K"},
- {(int)KS_CD, "\033[J"},
- {(int)KS_AL, "\033[L"},
- # ifdef TERMINFO
- {(int)KS_CAL, "\033[%p1%dL"},
- # else
- {(int)KS_CAL, "\033[%dL"},
- # endif
- {(int)KS_DL, "\033[M"},
- # ifdef TERMINFO
- {(int)KS_CDL, "\033[%p1%dM"},
- # else
- {(int)KS_CDL, "\033[%dM"},
- # endif
- {(int)KS_CL, "\033[H\033[2J"},
- #ifdef notyet
- {(int)KS_VI, "[VI]"}, // cursor invisible, VT320: CSI ? 25 l
- {(int)KS_VE, "[VE]"}, // cursor visible, VT320: CSI ? 25 h
- #endif
- {(int)KS_ME, "\033[m"}, // normal mode
- {(int)KS_MR, "\033[7m"}, // reverse
- {(int)KS_MD, "\033[1m"}, // bold
- {(int)KS_SO, "\033[31m"}, // standout mode: red
- {(int)KS_SE, "\033[m"}, // standout end
- {(int)KS_CZH, "\033[35m"}, // italic: purple
- {(int)KS_CZR, "\033[m"}, // italic end
- {(int)KS_US, "\033[4m"}, // underscore mode
- {(int)KS_UE, "\033[m"}, // underscore end
- {(int)KS_CCO, "8"}, // allow 8 colors
- # ifdef TERMINFO
- {(int)KS_CAB, "\033[4%p1%dm"},// set background color
- {(int)KS_CAF, "\033[3%p1%dm"},// set foreground color
- # else
- {(int)KS_CAB, "\033[4%dm"}, // set background color
- {(int)KS_CAF, "\033[3%dm"}, // set foreground color
- # endif
- {(int)KS_OP, "\033[m"}, // reset colors
- {(int)KS_MS, "y"}, // safe to move cur in reverse mode
- {(int)KS_UT, "y"}, // guessed
- {(int)KS_LE, "\b"},
- # ifdef TERMINFO
- {(int)KS_CM, "\033[%i%p1%d;%p2%dH"},
- # else
- {(int)KS_CM, "\033[%i%d;%dH"},
- # endif
- {(int)KS_SR, "\033M"},
- # ifdef TERMINFO
- {(int)KS_CRI, "\033[%p1%dC"},
- # else
- {(int)KS_CRI, "\033[%dC"},
- # endif
-
- {K_UP, "\033[A"},
- {K_DOWN, "\033[B"},
- {K_LEFT, "\033[D"},
- {K_RIGHT, "\033[C"},
- # endif
-
- # if defined(UNIX) || defined(ALL_BUILTIN_TCAPS) || defined(SOME_BUILTIN_TCAPS)
/*
* standard ANSI terminal, default for unix
*/
--- 372,378 ----
***************
*** 474,482 ****
# else
{(int)KS_CRI, "\033[%dC"},
# endif
- # endif

- # if defined(ALL_BUILTIN_TCAPS)
/*
* These codes are valid when nansi.sys or equivalent has been installed.
* Function keys on a PC are preceded with a NUL. These are converted into
--- 406,412 ----
***************
*** 555,563 ****
{K_END, "\316O"},
{K_PAGEDOWN, "\316Q"},
{K_PAGEUP, "\316I"},
- # endif

- # if defined(MSWIN) || defined(ALL_BUILTIN_TCAPS)
/*
* These codes are valid for the Win32 Console . The entries that start with
* ESC | are translated into console calls in os_win32.c. The function keys
--- 485,491 ----
***************
*** 689,697 ****
{K_K9, "\316\376"},
{K_BS, "\316x"},
{K_S_BS, "\316y"},
- # endif

- # if defined(VMS) || defined(ALL_BUILTIN_TCAPS)
/*
* VT320 is working as an ANSI terminal compatible DEC terminal.
* (it covers VT1x0, VT2x0 and VT3x0 up to VT320 on VMS as well)
--- 617,623 ----
***************
*** 791,799 ****
{K_K8, "\033Ox"}, // keypad 8
{K_K9, "\033Oy"}, // keypad 9
{K_BS, "\x7f"}, // for some reason 0177 doesn't work
- # endif

- # if defined(ALL_BUILTIN_TCAPS)
/*
* Ordinary vt52
*/
--- 717,723 ----
***************
*** 818,826 ****
{K_F3, "\033R"},
{(int)KS_CL, "\033H\033J"},
{(int)KS_MS, "y"},
- # endif

- # if defined(UNIX) || defined(ALL_BUILTIN_TCAPS) || defined(SOME_BUILTIN_TCAPS)
{(int)KS_NAME, "xterm"},
{(int)KS_CE, "\033[K"},
{(int)KS_AL, "\033[L"},
--- 742,748 ----
***************
*** 1012,1020 ****
{TERMCAP2KEY('F', 'P'), "\033[56;*~"}, // F35
{TERMCAP2KEY('F', 'Q'), "\033[57;*~"}, // F36
{TERMCAP2KEY('F', 'R'), "\033[58;*~"}, // F37
- # endif

- # if defined(UNIX) || defined(ALL_BUILTIN_TCAPS)
/*
* iris-ansi for Silicon Graphics machines.
*/
--- 934,940 ----
***************
*** 1128,1136 ****
{K_END, "\033[146q"},
{K_PAGEUP, "\033[150q"},
{K_PAGEDOWN, "\033[154q"},
- # endif

- # if defined(DEBUG) || defined(ALL_BUILTIN_TCAPS)
/*
* for debugging
*/
--- 1048,1054 ----
***************
*** 1316,1324 ****
{K_K7, "[K7]"},
{K_K8, "[K8]"},
{K_K9, "[K9]"},
- # endif
-
- #endif // NO_BUILTIN_TCAPS

/*
* The most minimal terminal: only clear screen and cursor positioning
--- 1234,1239 ----
*** ../vim-9.0.0279/src/evalfunc.c 2022-08-26 16:58:46.139489368 +0100
--- src/evalfunc.c 2022-08-26 17:21:56.879585251 +0100
***************
*** 5469,5488 ****
0
#endif
},
! {"builtin_terms",
! #if defined(SOME_BUILTIN_TCAPS) || defined(ALL_BUILTIN_TCAPS)
! 1
! #else
! 0
! #endif
! },
! {"all_builtin_terms",
! #if defined(ALL_BUILTIN_TCAPS)
! 1
! #else
! 0
! #endif
! },
{"browsefilter",
#if defined(FEAT_BROWSE) && (defined(USE_FILE_CHOOSER) \
|| defined(FEAT_GUI_MSWIN) \
--- 5469,5476 ----
0
#endif
},
! {"builtin_terms", 1},
! {"all_builtin_terms", 1},
{"browsefilter",
#if defined(FEAT_BROWSE) && (defined(USE_FILE_CHOOSER) \
|| defined(FEAT_GUI_MSWIN) \
*** ../vim-9.0.0279/src/version.c 2022-08-26 16:58:46.143489384 +0100
--- src/version.c 2022-08-26 17:44:17.590989105 +0100
***************
*** 134,148 ****
#else
"-browse",
#endif
- #ifdef NO_BUILTIN_TCAPS
- "-builtin_terms",
- #endif
- #ifdef SOME_BUILTIN_TCAPS
- "+builtin_terms",
- #endif
- #ifdef ALL_BUILTIN_TCAPS
"++builtin_terms",
- #endif
#ifdef FEAT_BYTEOFF
"+byte_offset",
#else
--- 134,140 ----
*** ../vim-9.0.0279/src/version.c 2022-08-26 16:58:46.143489384 +0100
--- src/version.c 2022-08-26 17:44:17.590989105 +0100
***************
*** 717,718 ****
--- 709,712 ----
{ /* Add new patch number below this line */
+ /**/
+ 280,
/**/

--
So when I saw the post to comp.editors, I rushed over to the FTP site to
grab it. So I yank apart the tarball, light x candles, where x= the
vim version multiplied by the md5sum of the source divided by the MAC of
my NIC (8A3FA78155A8A1D346C3C4A), put on black robes, dim the lights,
wave a dead chicken over the hard drive, and summon the power of GNU GCC
with the magic words "make config ; make!".
[Jason Spence, compiling Vim 5.0]

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///