mirror of https://github.com/tmux/tmux.git
Merge branch 'obsd-master'
commit
0a8571b6fe
|
@ -805,10 +805,10 @@ cmdq_running(struct client *c)
|
||||||
struct cmdq_list *queue = cmdq_get(c);
|
struct cmdq_list *queue = cmdq_get(c);
|
||||||
|
|
||||||
if (queue->item == NULL)
|
if (queue->item == NULL)
|
||||||
return (NULL);
|
return (NULL);
|
||||||
if (queue->item->flags & CMDQ_WAITING)
|
if (queue->item->flags & CMDQ_WAITING)
|
||||||
return (NULL);
|
return (NULL);
|
||||||
return (queue->item);
|
return (queue->item);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Print a guard line. */
|
/* Print a guard line. */
|
||||||
|
|
|
@ -4694,7 +4694,7 @@ window_copy_get_selection(struct window_mode_entry *wme, size_t *len)
|
||||||
if (keys == MODEKEY_EMACS || lastex <= ey_last) {
|
if (keys == MODEKEY_EMACS || lastex <= ey_last) {
|
||||||
if (~grid_get_line(data->backing->grid, ey)->flags &
|
if (~grid_get_line(data->backing->grid, ey)->flags &
|
||||||
GRID_LINE_WRAPPED || lastex != ey_last)
|
GRID_LINE_WRAPPED || lastex != ey_last)
|
||||||
off -= 1;
|
off -= 1;
|
||||||
}
|
}
|
||||||
*len = off;
|
*len = off;
|
||||||
return (buf);
|
return (buf);
|
||||||
|
|
Loading…
Reference in New Issue