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

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2025-03-17 22:01:10 +00:00
parent d4b8635f50 817b621d20
commit 3eb93383a3
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tty-keys.c
View File

@@ -937,6 +937,11 @@ partial_key:
delay = options_get_number(global_options, "escape-time"); delay = options_get_number(global_options, "escape-time");
if (delay == 0) if (delay == 0)
delay = 1; delay = 1;
if ((tty->flags & TTY_ALL_REQUEST_FLAGS) != TTY_ALL_REQUEST_FLAGS) {
log_debug("%s: increasing delay for active DA query", c->name);
if (delay < 500)
delay = 500;
}
tv.tv_sec = delay / 1000; tv.tv_sec = delay / 1000;
tv.tv_usec = (delay % 1000) * 1000L; tv.tv_usec = (delay % 1000) * 1000L;

2
window-copy.c
View File

@@ -4263,6 +4263,8 @@ window_copy_match_at_cursor(struct window_copy_mode_data *data)
buf = xrealloc(buf, len + 2); buf = xrealloc(buf, len + 2);
buf[len] = '\t'; buf[len] = '\t';
len++; len++;
} else if (gc.flags & GRID_FLAG_PADDING) {
/* nothing to do */
} else { } else {
buf = xrealloc(buf, len + gc.data.size + 1); buf = xrealloc(buf, len + gc.data.size + 1);
memcpy(buf + len, gc.data.data, gc.data.size); memcpy(buf + len, gc.data.data, gc.data.size);