5 files changed, 15 insertions, 1 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 6e9f89bbb5..8c8881b398 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -10684,6 +10684,7 @@ static void f_has(typval_T *argvars, typval_T *rettv)
     "tablineat",
     "tag_binary",
     "tag_old_static",
+    "termguicolors",
     "termresponse",
     "textobjects",
     "title",
diff --git a/src/nvim/option_defs.h b/src/nvim/option_defs.h
index 87a9a7398c..904e97f8ca 100644
--- a/src/nvim/option_defs.h
+++ b/src/nvim/option_defs.h
@@ -619,6 +619,7 @@ EXTERN long p_titlelen;         ///< 'titlelen'
 EXTERN char_u *p_titleold;      ///< 'titleold'
 EXTERN char_u *p_titlestring;   ///< 'titlestring'
 EXTERN char_u *p_tsr;           ///< 'thesaurus'
+EXTERN bool p_tgc;              ///< 'termguicolors'
 EXTERN int p_ttimeout;          ///< 'ttimeout'
 EXTERN long p_ttm;              ///< 'ttimeoutlen'
 EXTERN char_u *p_udir;          ///< 'undodir'
diff --git a/src/nvim/options.lua b/src/nvim/options.lua
index a743e8c605..218e34f595 100644
--- a/src/nvim/options.lua
+++ b/src/nvim/options.lua
@@ -2383,6 +2383,14 @@ return {
       defaults={if_true={vi=""}}
     },
     {
+      full_name='termguicolors', abbreviation='tgc',
+      type='bool', scope={'global'},
+      vi_def=false,
+      redraw={'everything'},
+      varname='p_tgc',
+      defaults={if_true={vi=false}}
+    },
+    {
       full_name='terse',
       type='bool', scope={'global'},
       vi_def=true,
diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c
index e1c0407b27..202c5666a1 100644
--- a/src/nvim/tui/tui.c
+++ b/src/nvim/tui/tui.c
@@ -81,7 +81,7 @@ UI *tui_start(void)
 {
   UI *ui = xcalloc(1, sizeof(UI));
   ui->stop = tui_stop;
-  ui->rgb = os_getenv("NVIM_TUI_ENABLE_TRUE_COLOR") != NULL;
+  ui->rgb = p_tgc;
   ui->resize = tui_resize;
   ui->clear = tui_clear;
   ui->eol_clear = tui_eol_clear;
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 81137ff1c6..00f8c28b5e 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -69,6 +69,10 @@ static char *features[] = {
 
 // clang-format off
 static int included_patches[] = {
+  1809,
+  1808,
+  1806,
+  1799,
   1757,
   1755,
   1753,