circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 21:56:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	Makefile
	tty-keys.c
This commit is contained in:
Thomas Adam
2014-04-05 12:36:14 +01:00
parent 806d5dcb17 acef311fe3
commit 0c99c7dbff
19 changed files with 166 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
format.c
View File

@ -603,12 +603,14 @@ format_window_pane(struct format_tree *ft, struct window_pane *wp)
/* Set default format keys for paste buffer. */
void
format_paste_buffer(struct format_tree *ft, struct paste_buffer *pb)
format_paste_buffer(struct format_tree *ft, struct paste_buffer *pb,
int utf8flag)
{
char *pb_print = paste_print(pb, 50);
char *s;
format_add(ft, "buffer_size", "%zu", pb->size);
format_add(ft, "buffer_sample", "%s", pb_print);
free(pb_print);
s = paste_make_sample(pb, utf8flag);
format_add(ft, "buffer_sample", "%s", s);
free(s);
}