circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 09:26:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2018-05-28 15:02:31 +01:00
parent 8f8e0975f1 c177a627d2
commit 058d2b94dc
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd-find.c
View File

@@ -111,7 +111,7 @@ cmd_find_inside_pane(struct client *c)
return (NULL); return (NULL);
RB_FOREACH(wp, window_pane_tree, &all_window_panes) { RB_FOREACH(wp, window_pane_tree, &all_window_panes) {
if (strcmp(wp->tty, c->ttyname) == 0) if (wp->fd != -1 && strcmp(wp->tty, c->ttyname) == 0)
break; break;
} }
if (wp != NULL) if (wp != NULL)
@@ -222,7 +222,7 @@ fail:
} }
/* /*
* Find the best winlink for a window (the current if it contains the pane, * Find the best winlink for a window (the current if it contains the window,
* otherwise the first). * otherwise the first).
*/ */
static int static int
@@ -919,6 +919,10 @@ cmd_find_from_client(struct cmd_find_state *fs, struct client *c, int flags)
cmd_find_log_state(__func__, fs); cmd_find_log_state(__func__, fs);
return (0); return (0);
} }
else {
log_debug("%s: session $%u does not have pane %%%u",
__func__, s->id, wp->id);
}
} }
/* /*

15
tmux.1
View File

@@ -3578,6 +3578,21 @@ if
is enabled, or is enabled, or
.Ql no .Ql no
if not. if not.
Conditionals can be nested arbitrarily.
Inside a conditional,
.Ql \&,
and
.Ql }
must be escaped as
.Ql #,
and
.Ql #} ,
unless they are part of a
.Ql #{...}
replacement. For example:
.Bd -literal -offset indent
#{?pane_in_mode,#[fg=white#,bg=red],#[fg=red#,bg=white]}#W .
.Ed
.Pp .Pp
Comparisons may be expressed by prefixing two comma-separated Comparisons may be expressed by prefixing two comma-separated
alternatives by alternatives by