===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tty.c,v
retrieving revision 1.335
retrieving revision 1.336
diff -c -r1.335 -r1.336
*** src/usr.bin/tmux/tty.c	2019/11/28 09:56:25	1.335
--- src/usr.bin/tmux/tty.c	2019/12/11 12:13:37	1.336
***************
*** 1,4 ****
! /* $OpenBSD: tty.c,v 1.335 2019/11/28 09:56:25 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: tty.c,v 1.336 2019/12/11 12:13:37 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 335,341 ****
  	tty->flags |= TTY_STARTED;
  	tty_invalidate(tty);
  
! 	tty_force_cursor_colour(tty, "");
  
  	tty->mouse_drag_flag = 0;
  	tty->mouse_drag_update = NULL;
--- 335,342 ----
  	tty->flags |= TTY_STARTED;
  	tty_invalidate(tty);
  
! 	if (*tty->ccolour != '\0')
! 		tty_force_cursor_colour(tty, "");
  
  	tty->mouse_drag_flag = 0;
  	tty->mouse_drag_update = NULL;
***************
*** 381,387 ****
  	}
  	if (tty->mode & MODE_BRACKETPASTE)
  		tty_raw(tty, "\033[?2004l");
! 	tty_raw(tty, tty_term_string(tty->term, TTYC_CR));
  
  	tty_raw(tty, tty_term_string(tty->term, TTYC_CNORM));
  	if (tty_term_has(tty->term, TTYC_KMOUS))
--- 382,389 ----
  	}
  	if (tty->mode & MODE_BRACKETPASTE)
  		tty_raw(tty, "\033[?2004l");
! 	if (*tty->ccolour != '\0')
! 		tty_raw(tty, tty_term_string(tty->term, TTYC_CR));
  
  	tty_raw(tty, tty_term_string(tty->term, TTYC_CNORM));
  	if (tty_term_has(tty->term, TTYC_KMOUS))