Mercurial > vim

comparison src/terminal.c @ 20176:901dc0e81e0b v8.2.0643

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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)
author Bram Moolenaar <Bram@vim.org>
date Sun, 26 Apr 2020 15:00:04 +0200
parents aadd1cae2ff5
children 28d82a342331
comparison
equal deleted inserted replaced
20175:7029c9fbb3ff 20176:901dc0e81e0b
845 // Make a copy of 'shell', an autocommand may change the option. 845 // Make a copy of 'shell', an autocommand may change the option.
846 tofree = cmd = vim_strsave(p_sh); 846 tofree = cmd = vim_strsave(p_sh);
847 847
848 // default to close when the shell exits 848 // default to close when the shell exits
849 if (opt.jo_term_finish == NUL) 849 if (opt.jo_term_finish == NUL)
850 opt.jo_term_finish = 'c'; 850 opt.jo_term_finish = TL_FINISH_CLOSE;
851 } 851 }
852 852
853 if (eap->addr_count > 0) 853 if (eap->addr_count > 0)
854 { 854 {
855 // Write lines from current buffer to the job. 855 // Write lines from current buffer to the job.
1928 if (term->tl_buffer == curbuf) 1928 if (term->tl_buffer == curbuf)
1929 maketitle(); 1929 maketitle();
1930 } 1930 }
1931 1931
1932 /* 1932 /*
1933 * Called after the job if finished and Terminal mode is not active: 1933 * Called after the job is finished and Terminal mode is not active:
1934 * Move the vterm contents into the scrollback buffer and free the vterm. 1934 * Move the vterm contents into the scrollback buffer and free the vterm.
1935 */ 1935 */
1936 static void 1936 static void
1937 cleanup_vterm(term_T *term) 1937 cleanup_vterm(term_T *term)
1938 { 1938 {
2696 { 2696 {
2697 case 0: return 0; 2697 case 0: return 0;
2698 case 1: return lookup_color( 0, fg, boldp) + 1; // black 2698 case 1: return lookup_color( 0, fg, boldp) + 1; // black
2699 case 2: return lookup_color( 4, fg, boldp) + 1; // dark red 2699 case 2: return lookup_color( 4, fg, boldp) + 1; // dark red
2700 case 3: return lookup_color( 2, fg, boldp) + 1; // dark green 2700 case 3: return lookup_color( 2, fg, boldp) + 1; // dark green
2701 case 4: return lookup_color( 6, fg, boldp) + 1; // brown 2701 case 4: return lookup_color( 7, fg, boldp) + 1; // dark yellow
2702 case 5: return lookup_color( 1, fg, boldp) + 1; // dark blue 2702 case 5: return lookup_color( 1, fg, boldp) + 1; // dark blue
2703 case 6: return lookup_color( 5, fg, boldp) + 1; // dark magenta 2703 case 6: return lookup_color( 5, fg, boldp) + 1; // dark magenta
2704 case 7: return lookup_color( 3, fg, boldp) + 1; // dark cyan 2704 case 7: return lookup_color( 3, fg, boldp) + 1; // dark cyan
2705 case 8: return lookup_color( 8, fg, boldp) + 1; // light grey 2705 case 8: return lookup_color( 8, fg, boldp) + 1; // light grey
2706 case 9: return lookup_color(12, fg, boldp) + 1; // dark grey 2706 case 9: return lookup_color(12, fg, boldp) + 1; // dark grey