circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-05-30 22:26:18 +00:00
Code Issues Projects Releases Wiki Activity

More trivial merge errors.

Browse Source
This commit is contained in:
Nicholas Marriott
2026-05-19 13:26:27 +01:00
parent 2695c5305e
commit f8e908b89c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server-fn.c
View File

@@ -340,8 +340,7 @@ server_destroy_pane(struct window_pane *wp, int notify)
case 0: case 0:
break; break;
case 2: case 2:
if (remain_on_exit == 2 && if (WIFEXITED(wp->status) && WEXITSTATUS(wp->status) == 0)
WIFEXITED(wp->status) && WEXITSTATUS(wp->status) == 0)
break; break;
/* FALLTHROUGH */ /* FALLTHROUGH */
case 1: case 1:

1
tmux.1
View File

@@ -3448,6 +3448,7 @@ $ make 2>&1|tmux splitw \-dI &
.Pp .Pp
All other options have the same meaning as for the All other options have the same meaning as for the
.Ic new\-window .Ic new\-window
command.
.Tg nextl .Tg nextl
.It Ic next\-layout Op Fl t Ar target\-window .It Ic next\-layout Op Fl t Ar target\-window
.D1 Pq alias: Ic nextl .D1 Pq alias: Ic nextl