circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-04 06:56:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	paste.c
This commit is contained in:
Thomas Adam
2016-10-13 08:09:47 +01:00
parent 76a9e6f27b e0add119ea
commit 6551f4bb3b
16 changed files with 414 additions and 490 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server-client.c
View File

@ -725,9 +725,10 @@ server_client_handle_key(struct client *c, key_code key)
server_clear_identify(c, NULL);
}
if (c->prompt_string != NULL) {
if (!(c->flags & CLIENT_READONLY))
status_prompt_key(c, key);
return;
if (c->flags & CLIENT_READONLY)
return;
if (status_prompt_key(c, key) == 0)
return;
}
/* Check for mouse keys. */