diff options
| author | Thomas Adam <thomas@xteddy.org> | 2024-04-23 16:09:50 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2024-04-23 16:09:50 +0100 |
| commit | 0a8571b6fe4fdd4e741605f1f2b44344bd8edeb8 (patch) | |
| tree | 4d9c686a594171dfd468ccb4665720a19595e4e4 | |
| parent | 036d8993e6daf37becf2782e98218b9be9ae8520 (diff) | |
| parent | ea9f416c9912f91f1abd2fda7f5bcb4981102971 (diff) | |
Merge branch 'obsd-master'
| -rw-r--r-- | cmd-queue.c | 8 | ||||
| -rw-r--r-- | window-copy.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cmd-queue.c b/cmd-queue.c index e188afcd..789af513 100644 --- a/cmd-queue.c +++ b/cmd-queue.c @@ -805,10 +805,10 @@ cmdq_running(struct client *c) struct cmdq_list *queue = cmdq_get(c); if (queue->item == NULL) - return (NULL); - if (queue->item->flags & CMDQ_WAITING) - return (NULL); - return (queue->item); + return (NULL); + if (queue->item->flags & CMDQ_WAITING) + return (NULL); + return (queue->item); } /* Print a guard line. */ diff --git a/window-copy.c b/window-copy.c index 27d9782a..a1f18476 100644 --- a/window-copy.c +++ b/window-copy.c @@ -4694,7 +4694,7 @@ window_copy_get_selection(struct window_mode_entry *wme, size_t *len) if (keys == MODEKEY_EMACS || lastex <= ey_last) { if (~grid_get_line(data->backing->grid, ey)->flags & GRID_LINE_WRAPPED || lastex != ey_last) - off -= 1; + off -= 1; } *len = off; return (buf); |