aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2017-07-12 16:01:11 +0100
committerThomas Adam <thomas@xteddy.org>2017-07-12 16:01:11 +0100
commite3698e6e1f3d7bfbe50ad74d816751ab465627ce (patch)
tree75254b12dd1e631d68dda632ec0f3612317ef977
parent5122f3477ff9e874480e6c97eb4627ec37eafd68 (diff)
parent8b84fc177cf2af7fcb68262a016e6c3e19cd8ba5 (diff)
downloadrtmux-e3698e6e1f3d7bfbe50ad74d816751ab465627ce.tar.gz
rtmux-e3698e6e1f3d7bfbe50ad74d816751ab465627ce.tar.bz2
rtmux-e3698e6e1f3d7bfbe50ad74d816751ab465627ce.zip
Merge branch 'obsd-master'
-rw-r--r--mode-tree.c2
-rw-r--r--window-tree.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/mode-tree.c b/mode-tree.c
index 8ce4c403..536da03b 100644
--- a/mode-tree.c
+++ b/mode-tree.c
@@ -487,7 +487,7 @@ mode_tree_draw(struct mode_tree_data *mtd)
screen_write_cursormove(&ctx, 0, i - mtd->offset);
if (i < 10)
- snprintf(key, sizeof key, "(%c)", '0' + i);
+ snprintf(key, sizeof key, "(%c) ", '0' + i);
else if (i < 36)
snprintf(key, sizeof key, "(M-%c)", 'a' + (i - 10));
else
diff --git a/window-tree.c b/window-tree.c
index 1ea1256e..57cda055 100644
--- a/window-tree.c
+++ b/window-tree.c
@@ -258,8 +258,12 @@ window_tree_build_window(struct session *s, struct winlink *wl, void* modedata,
free(text);
free(name);
+ if (window_count_panes(wl->window) == 1)
+ return (1);
+
l = NULL;
n = 0;
+
TAILQ_FOREACH(wp, &wl->window->panes, entry) {
if (filter != NULL) {
cp = format_single(NULL, filter, NULL, s, wl, wp);