To: vim_dev@googlegroups.com
Subject: Patch 8.2.3251
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.2.3251
Problem:    Listing builtin_gui as an available terminal is confusing.
Solution:   Do not list builtin_gui. (Christian Brabandt, closes #8669,
            closes #8661)
Files:      src/term.c, src/testdir/test_termcodes.vim


*** ../vim-8.2.3250/src/term.c	2021-06-08 20:13:27.363916582 +0200
--- src/term.c	2021-07-30 21:16:12.782358808 +0200
***************
*** 1786,1792 ****
      mch_errmsg("\r\n");
      for (termp = &(builtin_termcaps[0]); termp->bt_string != NULL; ++termp)
      {
! 	if (termp->bt_entry == (int)KS_NAME)
  	{
  #ifdef HAVE_TGETENT
  	    mch_errmsg("    builtin_");
--- 1786,1793 ----
      mch_errmsg("\r\n");
      for (termp = &(builtin_termcaps[0]); termp->bt_string != NULL; ++termp)
      {
! 	if (termp->bt_entry == (int)KS_NAME
! 		&& STRCMP(termp->bt_string, "gui") != 0)
  	{
  #ifdef HAVE_TGETENT
  	    mch_errmsg("    builtin_");
*** ../vim-8.2.3250/src/testdir/test_termcodes.vim	2021-03-22 19:37:02.545019774 +0100
--- src/testdir/test_termcodes.vim	2021-07-30 21:16:41.650298129 +0200
***************
*** 2348,2351 ****
--- 2348,2363 ----
    bw!
  endfunc
  
+ func Test_terminal_builtin_without_gui()
+   CheckNotMSWindows
+ 
+   " builtin_gui should not be output by :set term=xxx
+   let output = systemlist("TERM=dumb " .. v:progpath .. " --clean -c ':set t_ti= t_te=' -c 'set term=xxx' -c ':q!'")
+   redraw!
+   call map(output, {_, val -> trim(val)})
+   call assert_equal(-1, index(output, 'builtin_gui'))
+   call assert_notequal(-1, index(output, 'builtin_dumb'))
+ endfunc
+ 
+ 
  " vim: shiftwidth=2 sts=2 expandtab
*** ../vim-8.2.3250/src/version.c	2021-07-30 20:51:51.761101629 +0200
--- src/version.c	2021-07-30 21:17:43.534167821 +0200
***************
*** 757,758 ****
--- 757,760 ----
  {   /* Add new patch number below this line */
+ /**/
+     3251,
  /**/

-- 
Facepalm statement #2: "If there is a country without immigrants I'm going to
move there"

 /// Bram Moolenaar -- Bram@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    ///