mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 09:26:05 +00:00 
			
		
		
		
	Merge branch 'obsd-master' into master
This commit is contained in:
		
							
								
								
									
										2
									
								
								colour.c
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								colour.c
									
									
									
									
									
								
							@@ -115,7 +115,7 @@ colour_force_rgb(int c)
 | 
			
		||||
		return (colour_256toRGB(c));
 | 
			
		||||
	if (c >= 0 && c <= 7)
 | 
			
		||||
		return (colour_256toRGB(c));
 | 
			
		||||
	if (c >= 90 & c <= 97)
 | 
			
		||||
	if (c >= 90 && c <= 97)
 | 
			
		||||
		return (colour_256toRGB(8 + c - 90));
 | 
			
		||||
	return (-1);
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								status.c
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								status.c
									
									
									
									
									
								
							@@ -1727,7 +1727,7 @@ status_prompt_complete_list_menu(struct client *c, char **list, u_int size,
 | 
			
		||||
		item.name = list[i];
 | 
			
		||||
		item.key = '0' + (i - spm->start);
 | 
			
		||||
		item.command = NULL;
 | 
			
		||||
		menu_add_item(menu, &item, NULL, NULL, NULL);
 | 
			
		||||
		menu_add_item(menu, &item, NULL, c, NULL);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if (options_get_number(c->session->options, "status-position") == 0)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user