Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2014-04-24 12:59:00 +01:00
15 changed files with 78 additions and 68 deletions

View File

@@ -1157,7 +1157,7 @@ status_prompt_key(struct client *c, int key)
c->flags |= CLIENT_STATUS;
break;
case MODEKEYEDIT_PASTE:
if ((pb = paste_get_top(&global_buffers)) == NULL)
if ((pb = paste_get_top()) == NULL)
break;
for (n = 0; n < pb->size; n++) {
ch = (u_char) pb->data[n];