Merge branch 'obsd-master'

Conflicts:
	Makefile
	client.c
	server-client.c
	server.c
	tmux.c
	tmux.h

1 files changed, 1 insertions, 1 deletions

diff --git a/paste.c b/paste.c
index 157aff51..2b4b4d34 100644
--- a/paste.c
+++ b/paste.c
@@ -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;