mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-06 03:18:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2025-04-03 14:01:10 +01:00
parent 2905395695 a7991dcbad
commit d3c39375d5
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
format.c
View File

@@ -5343,9 +5343,8 @@ format_grid_word(struct grid *gd, u_int x, u_int y)
for (;;) { for (;;) {
grid_get_cell(gd, x, y, &gc); grid_get_cell(gd, x, y, &gc);
if (gc.flags & GRID_FLAG_PADDING) if ((~gc.flags & GRID_FLAG_PADDING) &&
break; format_is_word_separator(ws, &gc)) {
if (format_is_word_separator(ws, &gc)) {
found = 1; found = 1;
break; break;
} }
@@ -5381,7 +5380,7 @@ format_grid_word(struct grid *gd, u_int x, u_int y)
grid_get_cell(gd, x, y, &gc); grid_get_cell(gd, x, y, &gc);
if (gc.flags & GRID_FLAG_PADDING) if (gc.flags & GRID_FLAG_PADDING)
break; continue;
if (format_is_word_separator(ws, &gc)) if (format_is_word_separator(ws, &gc))
break; break;

4
window-copy.c
View File

@@ -869,9 +869,9 @@ window_copy_get_word(struct window_pane *wp, u_int x, u_int y)
{ {
struct window_mode_entry *wme = TAILQ_FIRST(&wp->modes); struct window_mode_entry *wme = TAILQ_FIRST(&wp->modes);
struct window_copy_mode_data *data = wme->data; struct window_copy_mode_data *data = wme->data;
struct grid *gd = data->screen.grid; struct grid *gd = data->backing->grid;
return (format_grid_word(gd, x, gd->hsize + y)); return (format_grid_word(gd, x, gd->hsize + y - data->oy));
} }
char * char *