# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1587906004 -7200
# Node ID 901dc0e81e0be09f8a34bf34a1a5166292deda53
# Parent  7029c9fbb3ff362fc9a8377559bde0d73a183a82
patch 8.2.0643: terminal uses brown instead of dark yellow

Commit: https://github.com/vim/vim/commit/e297802d6ddbebbf36f9a2d01127c034fab88b3b
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sun Apr 26 14:47:44 2020 +0200

    patch 8.2.0643: terminal uses brown instead of dark yellow

    Problem:    Terminal uses brown instead of dark yellow. (Romain Lafourcade)
    Solution:   Use color index 3 instead of 130. (closes https://github.com/vim/vim/issues/5993)

diff --git a/src/terminal.c b/src/terminal.c
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -847,7 +847,7 @@ ex_terminal(exarg_T *eap)
 
 	// default to close when the shell exits
 	if (opt.jo_term_finish == NUL)
-	    opt.jo_term_finish = 'c';
+	    opt.jo_term_finish = TL_FINISH_CLOSE;
     }
 
     if (eap->addr_count > 0)
@@ -1930,7 +1930,7 @@ set_terminal_mode(term_T *term, int norm
 }
 
 /*
- * Called after the job if finished and Terminal mode is not active:
+ * Called after the job is finished and Terminal mode is not active:
  * Move the vterm contents into the scrollback buffer and free the vterm.
  */
     static void
@@ -2698,7 +2698,7 @@ color2index(VTermColor *color, int fg, i
 	    case  1: return lookup_color( 0, fg, boldp) + 1; // black
 	    case  2: return lookup_color( 4, fg, boldp) + 1; // dark red
 	    case  3: return lookup_color( 2, fg, boldp) + 1; // dark green
-	    case  4: return lookup_color( 6, fg, boldp) + 1; // brown
+	    case  4: return lookup_color( 7, fg, boldp) + 1; // dark yellow
 	    case  5: return lookup_color( 1, fg, boldp) + 1; // dark blue
 	    case  6: return lookup_color( 5, fg, boldp) + 1; // dark magenta
 	    case  7: return lookup_color( 3, fg, boldp) + 1; // dark cyan
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    643,
+/**/
     642,
 /**/
     641,