Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2014-09-25 11:29:54 +01:00
20 changed files with 140 additions and 52 deletions

View File

@ -101,7 +101,7 @@ paste_get_name(const char *name)
if (name == NULL || *name == '\0')
return (NULL);
pbfind.name = (char*)name;
pbfind.name = (char *)name;
return (RB_FIND(paste_name_tree, &paste_by_name, &pbfind));
}
@ -114,7 +114,7 @@ paste_free_name(const char *name)
if (name == NULL || *name == '\0')
return (-1);
pbfind.name = (char*)name;
pbfind.name = (char *)name;
pb = RB_FIND(paste_name_tree, &paste_by_name, &pbfind);
if (pb == NULL)
return (-1);
@ -297,6 +297,9 @@ paste_send_pane(struct paste_buffer *pb, struct window_pane *wp,
const char *data = pb->data, *end = data + pb->size, *lf;
size_t seplen;
if (wp->flags & PANE_INPUTOFF)
return;
if (bracket)
bufferevent_write(wp->event, "\033[200~", 6);