===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-set-option.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -c -r1.79 -r1.80
*** src/usr.bin/tmux/cmd-set-option.c	2015/08/28 15:51:48	1.79
--- src/usr.bin/tmux/cmd-set-option.c	2015/08/28 16:10:46	1.80
***************
*** 1,4 ****
! /* $OpenBSD: cmd-set-option.c,v 1.79 2015/08/28 15:51:48 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-set-option.c,v 1.80 2015/08/28 16:10:46 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 180,186 ****
  	if (strcmp(oe->name, "automatic-rename") == 0) {
  		RB_FOREACH(w, windows, &windows) {
  			if (options_get_number(&w->options, "automatic-rename"))
! 				w->active->flags |= PANE_CHANGED;
  		}
  	}
  	if (strcmp(oe->name, "status") == 0 ||
--- 180,188 ----
  	if (strcmp(oe->name, "automatic-rename") == 0) {
  		RB_FOREACH(w, windows, &windows) {
  			if (options_get_number(&w->options, "automatic-rename"))
! 				queue_window_name(w);
! 			else if (event_initialized(&w->name_timer))
! 				evtimer_del(&w->name_timer);
  		}
  	}
  	if (strcmp(oe->name, "status") == 0 ||