circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-10-12 13:44:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into command_parser

Browse Source 
# Conflicts:
#	cmd-parse.y
#	regress/control-client-exit.sh
#	regress/if-shell-error.sh
#	tmux.h
This commit is contained in:
Nicholas Marriott
2026-10-06 13:16:00 +01:00
parent c624de9f3c 068812380f
commit d2d4b1bcee
205 changed files with 14822 additions and 2883 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
window-switch.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: window-switch.c,v 1.3 2026/08/25 07:23:30 nicm Exp $ */
/* $OpenBSD: window-switch.c,v 1.4 2026/09/01 21:03:55 nicm Exp $ */
/*
* Copyright (c) 2026 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -374,6 +374,9 @@ window_switch_init(struct window_mode_entry *wme,
data->prompt = prompt_create(&pd);
prompt_update(data->prompt, "(search) ", data->filter);
s = &data->screen;
screen_init(s, screen_size_x(&wp->base), screen_size_y(&wp->base), 0);
if (!args_has(args, 'Z'))
data->zoomed = -1;
else {
@@ -382,9 +385,6 @@ window_switch_init(struct window_mode_entry *wme,
server_redraw_window(wp->window);
}
s = &data->screen;
screen_init(s, screen_size_x(&wp->base), screen_size_y(&wp->base), 0);
window_switch_build(data);
prompt_incremental_start(data->prompt);
window_switch_draw_screen(wme);