===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-attach-session.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -c -r1.85 -r1.86
*** src/usr.bin/tmux/cmd-attach-session.c	2020/09/03 12:47:33	1.85
--- src/usr.bin/tmux/cmd-attach-session.c	2021/08/13 06:52:51	1.86
***************
*** 1,4 ****
! /* $OpenBSD: cmd-attach-session.c,v 1.85 2020/09/03 12:47:33 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-attach-session.c,v 1.86 2021/08/13 06:52:51 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 124,140 ****
  		if (!Eflag)
  			environ_update(s->options, c->environ, s->environ);
  
! 		c->session = s;
  		if (~cmdq_get_flags(item) & CMDQ_STATE_REPEAT)
  			server_client_set_key_table(c, NULL);
- 		tty_update_client_offset(c);
- 		status_timer_start(c);
- 		notify_client("client-session-changed", c);
- 		session_update_activity(s, NULL);
- 		gettimeofday(&s->last_attached_time, NULL);
- 		server_redraw_client(c);
- 		s->curw->flags &= ~WINLINK_ALERTFLAGS;
- 		s->curw->window->latest = c;
  	} else {
  		if (server_client_open(c, &cause) != 0) {
  			cmdq_error(item, "open terminal failed: %s", cause);
--- 124,132 ----
  		if (!Eflag)
  			environ_update(s->options, c->environ, s->environ);
  
! 		server_client_set_session(c, s);
  		if (~cmdq_get_flags(item) & CMDQ_STATE_REPEAT)
  			server_client_set_key_table(c, NULL);
  	} else {
  		if (server_client_open(c, &cause) != 0) {
  			cmdq_error(item, "open terminal failed: %s", cause);
***************
*** 156,180 ****
  		if (!Eflag)
  			environ_update(s->options, c->environ, s->environ);
  
! 		c->session = s;
  		server_client_set_key_table(c, NULL);
- 		tty_update_client_offset(c);
- 		status_timer_start(c);
- 		notify_client("client-session-changed", c);
- 		session_update_activity(s, NULL);
- 		gettimeofday(&s->last_attached_time, NULL);
- 		server_redraw_client(c);
- 		s->curw->flags &= ~WINLINK_ALERTFLAGS;
- 		s->curw->window->latest = c;
  
  		if (~c->flags & CLIENT_CONTROL)
  			proc_send(c->peer, MSG_READY, -1, NULL, 0);
  		notify_client("client-attached", c);
  		c->flags |= CLIENT_ATTACHED;
  	}
- 	recalculate_sizes();
- 	alerts_check_session(s);
- 	server_update_socket();
  
  	return (CMD_RETURN_NORMAL);
  }
--- 148,161 ----
  		if (!Eflag)
  			environ_update(s->options, c->environ, s->environ);
  
! 		server_client_set_session(c, s);
  		server_client_set_key_table(c, NULL);
  
  		if (~c->flags & CLIENT_CONTROL)
  			proc_send(c->peer, MSG_READY, -1, NULL, 0);
  		notify_client("client-attached", c);
  		c->flags |= CLIENT_ATTACHED;
  	}
  
  	return (CMD_RETURN_NORMAL);
  }