aboutsummaryrefslogtreecommitdiff
path: root/paste.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2014-10-02 09:29:48 +0100
committerNicholas Marriott <nicholas.marriott@gmail.com>2014-10-02 09:29:48 +0100
commit931c17ed4f3ac18470f5b385210d61b24a57b5d4 (patch)
tree6dbcfe073cec1ba8f34626bdfa04123b621eb9ed /paste.c
parent24d9dc518de6761f645165d49f321b2b56904fb5 (diff)
parent2874a431c050527244a56e7f241baf053c722f88 (diff)
downloadrtmux-931c17ed4f3ac18470f5b385210d61b24a57b5d4.tar.gz
rtmux-931c17ed4f3ac18470f5b385210d61b24a57b5d4.tar.bz2
rtmux-931c17ed4f3ac18470f5b385210d61b24a57b5d4.zip
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Diffstat (limited to 'paste.c')
-rw-r--r--paste.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/paste.c b/paste.c
index b05cf025..4af8cccf 100644
--- a/paste.c
+++ b/paste.c
@@ -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);