circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-10-07 02:04:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/tmux-openbsd/master'

Browse Source 
* refs/remotes/tmux-openbsd/master:
  Do not use subtraction for comparators, this doesn't really matter for IDs but it breaks key sorting. GitHub issue 5646 from Alexandre Fiori.
  Fix dragging a floating pane by its top border over a tiled pane's status line, GitHub issue 5645 from Michael Grant.
  Fix floating panes not being detected as obscuring the pane behind them, GitHub issue 5641 from Michael Grant.
  Exit 128 + SIGHUP like popups did if waiting for a pane that was killed, from Alexandre Fiori.
This commit is contained in:
tmux update bot
2026-09-28 12:05:39 +00:00
parent 294bf0bf16 db3950ed07
commit a9b9795487
5 changed files with 94 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
hyperlinks.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: hyperlinks.c,v 1.5 2026/06/29 16:44:06 nicm Exp $ */
/* $OpenBSD: hyperlinks.c,v 1.6 2026/09/28 10:42:01 nicm Exp $ */
/*
* Copyright (c) 2021 Will <author@will.party>
@@ -87,7 +87,11 @@ hyperlinks_by_uri_cmp(struct hyperlinks_uri *left, struct hyperlinks_uri *right)
return (-1);
if (*right->internal_id != '\0')
return (1);
return (left->inner - right->inner);
if (left->inner < right->inner)
return (-1);
if (left->inner > right->inner)
return (1);
return (0);
}
r = strcmp(left->internal_id, right->internal_id);
@@ -104,7 +108,11 @@ static int
hyperlinks_by_inner_cmp(struct hyperlinks_uri *left,
struct hyperlinks_uri *right)
{
return (left->inner - right->inner);
if (left->inner < right->inner)
return (-1);
if (left->inner > right->inner)
return (1);
return (0);
}
RB_PROTOTYPE_STATIC(hyperlinks_by_inner_tree, hyperlinks_uri, by_inner_entry,
hyperlinks_by_inner_cmp);