mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 09:07:38 +00:00 
			
		
		
		
	Merge branch 'obsd-master'
This commit is contained in:
		@@ -207,6 +207,7 @@ const struct options_name_map options_other_names[] = {
 | 
			
		||||
	{ "display-panes-active-color", "display-panes-active-colour" },
 | 
			
		||||
	{ "clock-mode-color", "clock-mode-colour" },
 | 
			
		||||
	{ "cursor-color", "cursor-colour" },
 | 
			
		||||
	{ "prompt-cursor-color", "prompt-cursor-colour" },
 | 
			
		||||
	{ "pane-colors", "pane-colours" },
 | 
			
		||||
	{ NULL, NULL }
 | 
			
		||||
};
 | 
			
		||||
@@ -831,6 +832,21 @@ const struct options_table_entry options_table[] = {
 | 
			
		||||
	  .text = "Style of the status line."
 | 
			
		||||
	},
 | 
			
		||||
 | 
			
		||||
	{ .name = "prompt-cursor-colour",
 | 
			
		||||
	  .type = OPTIONS_TABLE_COLOUR,
 | 
			
		||||
	  .scope = OPTIONS_TABLE_SESSION,
 | 
			
		||||
	  .default_num = 6,
 | 
			
		||||
	  .text = "Colour of the cursor when in the command prompt."
 | 
			
		||||
	},
 | 
			
		||||
 | 
			
		||||
	{ .name = "prompt-cursor-style",
 | 
			
		||||
	  .type = OPTIONS_TABLE_CHOICE,
 | 
			
		||||
	  .scope = OPTIONS_TABLE_SESSION,
 | 
			
		||||
	  .choices = options_table_cursor_style_list,
 | 
			
		||||
	  .default_num = 0,
 | 
			
		||||
	  .text = "Style of the cursor when in the command prompt."
 | 
			
		||||
	},
 | 
			
		||||
 | 
			
		||||
	{ .name = "update-environment",
 | 
			
		||||
	  .type = OPTIONS_TABLE_STRING,
 | 
			
		||||
	  .scope = OPTIONS_TABLE_SESSION,
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user