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:
		@@ -121,7 +121,10 @@ cmd_if_shell_exec(struct cmd *self, struct cmdq_item *item)
 | 
				
			|||||||
		cdata->cmd_else = NULL;
 | 
							cdata->cmd_else = NULL;
 | 
				
			||||||
	memcpy(&cdata->mouse, m, sizeof cdata->mouse);
 | 
						memcpy(&cdata->mouse, m, sizeof cdata->mouse);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	cdata->client = item->client;
 | 
						if (!args_has(args, 'b'))
 | 
				
			||||||
 | 
							cdata->client = item->client;
 | 
				
			||||||
 | 
						else
 | 
				
			||||||
 | 
							cdata->client = c;
 | 
				
			||||||
	if (cdata->client != NULL)
 | 
						if (cdata->client != NULL)
 | 
				
			||||||
		cdata->client->references++;
 | 
							cdata->client->references++;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1224,6 +1224,7 @@ server_client_handle_key(struct client *c, struct key_event *event)
 | 
				
			|||||||
				return (0);
 | 
									return (0);
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 | 
							server_client_clear_overlay(c);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	/*
 | 
						/*
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user