Patch 8.2.0643

[Bram Moolenaar]

Patch 8.2.0643 (after 8.2.0635)
Problem: Terminal uses brown instead of dark yellow. (Romain Lafourcade)
Solution: Use color index 3 instead of 130. (closes #5993)
Files: src/terminal.c


*** ../vim-8.2.0642/src/terminal.c 2020-04-12 19:37:13.526297236 +0200
--- src/terminal.c 2020-04-26 14:41:13.625614260 +0200
***************
*** 847,853 ****

// default to close when the shell exits
if (opt.jo_term_finish == NUL)
! opt.jo_term_finish = 'c';
}

if (eap->addr_count > 0)
--- 847,853 ----

// default to close when the shell exits
if (opt.jo_term_finish == NUL)
! opt.jo_term_finish = TL_FINISH_CLOSE;
}

if (eap->addr_count > 0)
***************
*** 1930,1936 ****
}

/*
! * Called after the job if finished and Terminal mode is not active:
* Move the vterm contents into the scrollback buffer and free the vterm.
*/
static void
--- 1930,1936 ----
}

/*
! * 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,2704 ****
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 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
--- 2698,2704 ----
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( 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
*** ../vim-8.2.0642/src/version.c 2020-04-26 14:29:53.450969744 +0200
--- src/version.c 2020-04-26 14:46:58.012850885 +0200
***************
*** 748,749 ****
--- 748,751 ----
{ /* Add new patch number below this line */
+ /**/
+ 643,
/**/

--
Shift happens.
-- Doppler

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///