Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2024-08-22 12:01:07 +01:00
commit 7990e5fa8f
3 changed files with 5 additions and 4 deletions

View File

@ -277,7 +277,6 @@ key_string_lookup_string(const char *string)
}
free(udp);
return (uc);
}
/* Check for short Ctrl key. */

View File

@ -607,6 +607,8 @@ status_prompt_set(struct client *c, struct cmd_find_state *fs,
struct format_tree *ft;
char *tmp;
server_client_clear_overlay(c);
if (fs != NULL)
ft = format_create_from_state(NULL, c, fs);
else

6
tmux.1
View File

@ -4493,9 +4493,9 @@ Set the character used to fill areas of the terminal unused by a window.
.It Ic main-pane-height Ar height
.It Ic main-pane-width Ar width
Set the width or height of the main (left or top) pane in the
.Ic main-horizontal,
.Ic main-horizontal-mirrored,
.Ic main-vertical,
.Ic main-horizontal ,
.Ic main-horizontal-mirrored ,
.Ic main-vertical ,
or
.Ic main-vertical-mirrored
layouts.