===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -c -r1.131 -r1.132
*** src/usr.bin/tmux/window.c	2015/05/12 22:40:38	1.131
--- src/usr.bin/tmux/window.c	2015/06/04 11:43:51	1.132
***************
*** 1,4 ****
! /* $OpenBSD: window.c,v 1.131 2015/05/12 22:40:38 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: window.c,v 1.132 2015/06/04 11:43:51 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 543,548 ****
--- 543,551 ----
  void
  window_lost_pane(struct window *w, struct window_pane *wp)
  {
+ 	if (wp == marked_window_pane)
+ 		server_clear_marked();
+ 
  	if (wp == w->active) {
  		w->active = w->last;
  		w->last = NULL;
***************
*** 661,666 ****
--- 664,671 ----
  		flags[pos++] = '*';
  	if (wl == TAILQ_FIRST(&s->lastw))
  		flags[pos++] = '-';
+ 	if (server_check_marked() && wl == marked_winlink)
+ 		flags[pos++] = 'M';
  	if (wl->window->flags & WINDOW_ZOOMED)
  		flags[pos++] = 'Z';
  	flags[pos] = '\0';