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:
		@@ -1704,7 +1704,6 @@ static void
 | 
			
		||||
server_client_dispatch(struct imsg *imsg, void *arg)
 | 
			
		||||
{
 | 
			
		||||
	struct client	*c = arg;
 | 
			
		||||
	const char	*data;
 | 
			
		||||
	ssize_t		 datalen;
 | 
			
		||||
	struct session	*s;
 | 
			
		||||
 | 
			
		||||
@@ -1716,7 +1715,6 @@ server_client_dispatch(struct imsg *imsg, void *arg)
 | 
			
		||||
		return;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	data = imsg->data;
 | 
			
		||||
	datalen = imsg->hdr.len - IMSG_HEADER_SIZE;
 | 
			
		||||
 | 
			
		||||
	switch (imsg->hdr.type) {
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										1
									
								
								tmux.1
									
									
									
									
									
								
							
							
						
						
									
										1
									
								
								tmux.1
									
									
									
									
									
								
							@@ -2718,7 +2718,6 @@ also lists only keys in
 | 
			
		||||
specifies a prefix to print before each key and
 | 
			
		||||
.Fl 1
 | 
			
		||||
lists only the first matching key.
 | 
			
		||||
.Pp
 | 
			
		||||
.It Xo Ic send-keys
 | 
			
		||||
.Op Fl FHlMRX
 | 
			
		||||
.Op Fl N Ar repeat-count
 | 
			
		||||
 
 | 
			
		||||
@@ -209,7 +209,7 @@ window_buffer_draw(__unused void *modedata, void *itemdata,
 | 
			
		||||
	struct paste_buffer		*pb;
 | 
			
		||||
	const char			*pdata, *start, *end;
 | 
			
		||||
	char				*buf = NULL;
 | 
			
		||||
	size_t				 psize, len;
 | 
			
		||||
	size_t				 psize;
 | 
			
		||||
	u_int				 i, cx = ctx->s->cx, cy = ctx->s->cy;
 | 
			
		||||
 | 
			
		||||
	pb = paste_get_name(item->name);
 | 
			
		||||
@@ -222,7 +222,7 @@ window_buffer_draw(__unused void *modedata, void *itemdata,
 | 
			
		||||
		while (end != pdata + psize && *end != '\n')
 | 
			
		||||
			end++;
 | 
			
		||||
		buf = xreallocarray(buf, 4, end - start + 1);
 | 
			
		||||
		len = utf8_strvis(buf, start, end - start, VIS_OCTAL|VIS_TAB);
 | 
			
		||||
		utf8_strvis(buf, start, end - start, VIS_OCTAL|VIS_TAB);
 | 
			
		||||
		if (*buf != '\0') {
 | 
			
		||||
			screen_write_cursormove(ctx, cx, cy + i, 0);
 | 
			
		||||
			screen_write_nputs(ctx, sx, &grid_default_cell, "%s",
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user