Merge branch 'obsd-master'

Conflicts:
	Makefile
	client.c
	server-client.c
	server.c
	tmux.c
	tmux.h
This commit is contained in:
Thomas Adam
2015-10-27 23:27:26 +00:00
43 changed files with 872 additions and 824 deletions

View File

@@ -150,7 +150,7 @@ paste_add(char *data, size_t size)
if (size == 0)
return;
limit = options_get_number(&global_options, "buffer-limit");
limit = options_get_number(global_options, "buffer-limit");
RB_FOREACH_REVERSE_SAFE(pb, paste_time_tree, &paste_by_time, pb1) {
if (paste_num_automatic < limit)
break;