Merge branch 'obsd-master'

Conflicts:
	cmd-find.c
This commit is contained in:
Thomas Adam
2015-10-25 09:21:37 +00:00
12 changed files with 78 additions and 19 deletions

View File

@@ -597,7 +597,7 @@ server_client_handle_key(struct client *c, int key)
m->valid = 0;
/* Treat everything as a regular key when pasting is detected. */
if (server_client_assume_paste(s)) {
if (!KEYC_IS_MOUSE(key) && server_client_assume_paste(s)) {
if (!(c->flags & CLIENT_READONLY))
window_pane_key(wp, c, s, key, m);
return;