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 #5993)

diff --git a/src/terminal.c b/src/terminal.c
index f7b653a6854220a8ce33cbfe90a2af1a1bc79e15..9d9dd6a6d321a37f271be263b18ef9cf69544e36 100644 (file)
--- 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 normal_mode)
 }
 
 /*
- * 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, int *boldp)
            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
index 590c392177b7570345501ca782aabd9fd05affc0..e78fc73390debc3561808a0c0bd2bf645485d79d 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    643,
 /**/
     642,
 /**/