mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 00:56:10 +00:00 
			
		
		
		
	Merge branch 'obsd-master' into master
This commit is contained in:
		
							
								
								
									
										7
									
								
								tmux.h
									
									
									
									
									
								
							
							
						
						
									
										7
									
								
								tmux.h
									
									
									
									
									
								
							@@ -1945,7 +1945,7 @@ char		*paste_make_sample(struct paste_buffer *);
 | 
			
		||||
#define FORMAT_WINDOW 0x40000000U
 | 
			
		||||
struct format_tree;
 | 
			
		||||
struct format_modifier;
 | 
			
		||||
typedef char *(*format_cb)(struct format_tree *);
 | 
			
		||||
typedef void *(*format_cb)(struct format_tree *);
 | 
			
		||||
const char	*format_skip(const char *, const char *);
 | 
			
		||||
int		 format_true(const char *);
 | 
			
		||||
struct format_tree *format_create(struct client *, struct cmdq_item *, int,
 | 
			
		||||
@@ -2590,6 +2590,10 @@ void	 grid_reader_cursor_next_word(struct grid_reader *, const char *);
 | 
			
		||||
void	 grid_reader_cursor_next_word_end(struct grid_reader *, const char *);
 | 
			
		||||
void	 grid_reader_cursor_previous_word(struct grid_reader *, const char *,
 | 
			
		||||
	     int);
 | 
			
		||||
int	 grid_reader_cursor_jump(struct grid_reader *,
 | 
			
		||||
	     const struct utf8_data *);
 | 
			
		||||
int	 grid_reader_cursor_jump_back(struct grid_reader *,
 | 
			
		||||
	     const struct utf8_data *);
 | 
			
		||||
 | 
			
		||||
/* grid-view.c */
 | 
			
		||||
void	 grid_view_get_cell(struct grid *, u_int, u_int, struct grid_cell *);
 | 
			
		||||
@@ -2710,7 +2714,6 @@ void	 screen_alternate_off(struct screen *, struct grid_cell *, int);
 | 
			
		||||
/* window.c */
 | 
			
		||||
extern struct windows windows;
 | 
			
		||||
extern struct window_pane_tree all_window_panes;
 | 
			
		||||
extern const struct window_mode *all_window_modes[];
 | 
			
		||||
int		 window_cmp(struct window *, struct window *);
 | 
			
		||||
RB_PROTOTYPE(windows, window, entry, window_cmp);
 | 
			
		||||
int		 winlink_cmp(struct winlink *, struct winlink *);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user