# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1627673404 -7200
# Node ID 2aefea114696c904967819e6b0724e9c748c1639
# Parent  738999603812bc5a49cba957feece1f595c13d59
patch 8.2.3251: listing builtin_gui as an available terminal is confusing

Commit: https://github.com/vim/vim/commit/0f5575d0a7316a9c9a4b02df3372a07514cd8f26
Author: Bram Moolenaar <Bram@vim.org>
Date:   Fri Jul 30 21:18:03 2021 +0200

    patch 8.2.3251: listing builtin_gui as an available terminal is confusing

    Problem:    Listing builtin_gui as an available terminal is confusing.
    Solution:   Do not list builtin_gui. (Christian Brabandt, closes https://github.com/vim/vim/issues/8669,
                closes #8661)

diff --git a/src/term.c b/src/term.c
--- a/src/term.c
+++ b/src/term.c
@@ -1786,7 +1786,8 @@ report_term_error(char *error_msg, char_
     mch_errmsg("\r\n");
     for (termp = &(builtin_termcaps[0]); termp->bt_string != NULL; ++termp)
     {
-	if (termp->bt_entry == (int)KS_NAME)
+	if (termp->bt_entry == (int)KS_NAME
+		&& STRCMP(termp->bt_string, "gui") != 0)
 	{
 #ifdef HAVE_TGETENT
 	    mch_errmsg("    builtin_");
diff --git a/src/testdir/test_termcodes.vim b/src/testdir/test_termcodes.vim
--- a/src/testdir/test_termcodes.vim
+++ b/src/testdir/test_termcodes.vim
@@ -2348,4 +2348,16 @@ func Test_special_term_keycodes()
   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
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3251,
+/**/
     3250,
 /**/
     3249,