===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window.c,v
retrieving revision 1.140
retrieving revision 1.141
diff -c -r1.140 -r1.141
*** src/usr.bin/tmux/window.c	2015/08/28 17:11:12	1.140
--- src/usr.bin/tmux/window.c	2015/08/29 00:29:15	1.141
***************
*** 1,4 ****
! /* $OpenBSD: window.c,v 1.140 2015/08/28 17:11:12 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: window.c,v 1.141 2015/08/29 00:29:15 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 299,306 ****
  		fatal("gettimeofday failed");
  
  	options_init(&w->options, &global_w_options);
- 	if (options_get_number(&w->options, "automatic-rename"))
- 		queue_window_name(w);
  
  	w->references = 0;
  
--- 299,304 ----
***************
*** 349,356 ****
  		layout_free_cell(w->saved_layout_root);
  	free(w->old_layout);
  
! 	if (event_initialized(&w->name_timer))
! 		evtimer_del(&w->name_timer);
  
  	options_free(&w->options);
  
--- 347,354 ----
  		layout_free_cell(w->saved_layout_root);
  	free(w->old_layout);
  
! 	if (event_initialized(&w->name_event))
! 		evtimer_del(&w->name_event);
  
  	options_free(&w->options);