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:
		@@ -964,7 +964,7 @@ const struct options_table_entry options_table[] = {
 | 
			
		||||
 | 
			
		||||
	{ .name = "pane-border-format",
 | 
			
		||||
	  .type = OPTIONS_TABLE_STRING,
 | 
			
		||||
	  .scope = OPTIONS_TABLE_WINDOW,
 | 
			
		||||
	  .scope = OPTIONS_TABLE_WINDOW|OPTIONS_TABLE_PANE,
 | 
			
		||||
	  .default_str = "#{?pane_active,#[reverse],}#{pane_index}#[default] "
 | 
			
		||||
			 "\"#{pane_title}\"",
 | 
			
		||||
	  .text = "Format of text in the pane status lines."
 | 
			
		||||
 
 | 
			
		||||
@@ -373,7 +373,7 @@ screen_redraw_make_pane_status(struct client *c, struct window_pane *wp,
 | 
			
		||||
		style_apply(&gc, w->options, "pane-active-border-style", ft);
 | 
			
		||||
	else
 | 
			
		||||
		style_apply(&gc, w->options, "pane-border-style", ft);
 | 
			
		||||
	fmt = options_get_string(w->options, "pane-border-format");
 | 
			
		||||
	fmt = options_get_string(wp->options, "pane-border-format");
 | 
			
		||||
 | 
			
		||||
	expanded = format_expand_time(ft, fmt);
 | 
			
		||||
	if (wp->sx < 4)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user