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:
		
							
								
								
									
										4
									
								
								format.c
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								format.c
									
									
									
									
									
								
							@@ -977,7 +977,7 @@ format_grid_word(struct grid *gd, u_int x, u_int y)
 | 
			
		||||
		if (x == 0) {
 | 
			
		||||
			if (y == 0)
 | 
			
		||||
				break;
 | 
			
		||||
			gl = &gd->linedata[y - 1];
 | 
			
		||||
			gl = grid_peek_line(gd, y - 1);
 | 
			
		||||
			if (~gl->flags & GRID_LINE_WRAPPED)
 | 
			
		||||
				break;
 | 
			
		||||
			y--;
 | 
			
		||||
@@ -993,7 +993,7 @@ format_grid_word(struct grid *gd, u_int x, u_int y)
 | 
			
		||||
			if (end == 0 || x == end - 1) {
 | 
			
		||||
				if (y == gd->hsize + gd->sy - 1)
 | 
			
		||||
					break;
 | 
			
		||||
				gl = &gd->linedata[y];
 | 
			
		||||
				gl = grid_peek_line(gd, y);
 | 
			
		||||
				if (~gl->flags & GRID_LINE_WRAPPED)
 | 
			
		||||
					break;
 | 
			
		||||
				y++;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user