mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 09:26:05 +00:00 
			
		
		
		
	Fix merge error, from Jakub Łukasiewicz.
This commit is contained in:
		
							
								
								
									
										2
									
								
								input.c
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								input.c
									
									
									
									
									
								
							@@ -2259,6 +2259,7 @@ input_dcs_dispatch(struct input_ctx *ictx)
 | 
			
		||||
	if (ictx->flags & INPUT_DISCARD) {
 | 
			
		||||
		log_debug("%s: %zu bytes (discard)", __func__, len);
 | 
			
		||||
		return (0);
 | 
			
		||||
	}
 | 
			
		||||
#ifdef ENABLE_SIXEL
 | 
			
		||||
	if (buf[0] == 'q') {
 | 
			
		||||
		si = sixel_parse(buf, len, w->xpixel, w->ypixel);
 | 
			
		||||
@@ -2266,7 +2267,6 @@ input_dcs_dispatch(struct input_ctx *ictx)
 | 
			
		||||
			screen_write_sixelimage(sctx, si, ictx->cell.cell.bg);
 | 
			
		||||
	}
 | 
			
		||||
#endif
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	allow_passthrough = options_get_number(wp->options, "allow-passthrough");
 | 
			
		||||
	if (!allow_passthrough)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user