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:
		
							
								
								
									
										7
									
								
								format.c
									
									
									
									
									
								
							
							
						
						
									
										7
									
								
								format.c
									
									
									
									
									
								
							@@ -1156,16 +1156,13 @@ format_defaults_pane(struct format_tree *ft, struct window_pane *wp)
 | 
			
		||||
	    !!(wp->base.mode & MODE_MOUSE_STANDARD));
 | 
			
		||||
	format_add(ft, "mouse_button_flag", "%d",
 | 
			
		||||
	    !!(wp->base.mode & MODE_MOUSE_BUTTON));
 | 
			
		||||
	format_add(ft, "mouse_utf8_flag", "%d",
 | 
			
		||||
	    !!(wp->base.mode & MODE_MOUSE_UTF8));
 | 
			
		||||
 | 
			
		||||
	format_add_cb(ft, "pane_tabs", format_cb_pane_tabs);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/* Set default format keys for paste buffer. */
 | 
			
		||||
void
 | 
			
		||||
format_defaults_paste_buffer(struct format_tree *ft, struct paste_buffer *pb,
 | 
			
		||||
    int utf8flag)
 | 
			
		||||
format_defaults_paste_buffer(struct format_tree *ft, struct paste_buffer *pb)
 | 
			
		||||
{
 | 
			
		||||
	size_t	 bufsize;
 | 
			
		||||
	char	*s;
 | 
			
		||||
@@ -1174,7 +1171,7 @@ format_defaults_paste_buffer(struct format_tree *ft, struct paste_buffer *pb,
 | 
			
		||||
	format_add(ft, "buffer_size", "%zu", bufsize);
 | 
			
		||||
	format_add(ft, "buffer_name", "%s", paste_buffer_name(pb));
 | 
			
		||||
 | 
			
		||||
	s = paste_make_sample(pb, utf8flag);
 | 
			
		||||
	s = paste_make_sample(pb);
 | 
			
		||||
	format_add(ft, "buffer_sample", "%s", s);
 | 
			
		||||
	free(s);
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user