mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 00:56:10 +00:00 
			
		
		
		
	Merge branch 'obsd-master'
This commit is contained in:
		@@ -98,7 +98,6 @@ cmd_attach_session(struct cmdq_item *item, int dflag, int rflag,
 | 
			
		||||
			environ_update(s->options, c->environ, s->environ);
 | 
			
		||||
 | 
			
		||||
		c->session = s;
 | 
			
		||||
		server_client_set_key_table(c, NULL);
 | 
			
		||||
		status_timer_start(c);
 | 
			
		||||
		notify_client("client-session-changed", c);
 | 
			
		||||
		session_update_activity(s, NULL);
 | 
			
		||||
 
 | 
			
		||||
@@ -277,7 +277,6 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item)
 | 
			
		||||
		} else if (c->session != NULL)
 | 
			
		||||
			c->last_session = c->session;
 | 
			
		||||
		c->session = s;
 | 
			
		||||
		server_client_set_key_table(c, NULL);
 | 
			
		||||
		status_timer_start(c);
 | 
			
		||||
		notify_client("client-session-changed", c);
 | 
			
		||||
		session_update_activity(s, NULL);
 | 
			
		||||
 
 | 
			
		||||
@@ -108,7 +108,6 @@ cmd_switch_client_exec(struct cmd *self, struct cmdq_item *item)
 | 
			
		||||
	if (c->session != NULL && c->session != s)
 | 
			
		||||
		c->last_session = c->session;
 | 
			
		||||
	c->session = s;
 | 
			
		||||
	server_client_set_key_table(c, NULL);
 | 
			
		||||
	status_timer_start(c);
 | 
			
		||||
	session_update_activity(s, NULL);
 | 
			
		||||
	gettimeofday(&s->last_attached_time, NULL);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user