summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-04-26 14:47:44 +0200
committerBram Moolenaar <Bram@vim.org>2020-04-26 14:47:44 +0200
commite297802d6ddbebbf36f9a2d01127c034fab88b3b (patch)
tree1df9b9885448d93347ef2947c723e223219b35ec
parent7d41aa8874a62eb399e13b94add7f0e5c4dd074b (diff)
downloadvim-git-e297802d6ddbebbf36f9a2d01127c034fab88b3b.tar.gz
patch 8.2.0643: terminal uses brown instead of dark yellowv8.2.0643
Problem: Terminal uses brown instead of dark yellow. (Romain Lafourcade) Solution: Use color index 3 instead of 130. (closes #5993)
-rw-r--r--src/terminal.c6
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/terminal.c b/src/terminal.c
index f7b653a68..9d9dd6a6d 100644
--- 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 590c39217..e78fc7339 100644
--- 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,