aboutsummaryrefslogtreecommitdiff
path: root/window.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2015-06-04 12:59:41 +0100
committerThomas Adam <thomas@xteddy.org>2015-06-04 12:59:41 +0100
commit02e348c069b9f49b44344281276b81fe537b3c8b (patch)
tree889ef55ab3da4ba5e3a8fe6aa7c3cb5708cdd724 /window.c
parent1de74e27e535b3e294c265974973a7743c8374a0 (diff)
parenta863834574ec02b87ff0e7245ef31f0d4543ab34 (diff)
downloadrtmux-02e348c069b9f49b44344281276b81fe537b3c8b.tar.gz
rtmux-02e348c069b9f49b44344281276b81fe537b3c8b.tar.bz2
rtmux-02e348c069b9f49b44344281276b81fe537b3c8b.zip
Merge branch 'obsd-master'
Diffstat (limited to 'window.c')
-rw-r--r--window.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/window.c b/window.c
index d07a813d..721d0213 100644
--- a/window.c
+++ b/window.c
@@ -542,6 +542,9 @@ window_add_pane(struct window *w, u_int hlimit)
void
window_lost_pane(struct window *w, struct window_pane *wp)
{
+ if (wp == marked_window_pane)
+ server_clear_marked();
+
if (wp == w->active) {
w->active = w->last;
w->last = NULL;
@@ -660,6 +663,8 @@ window_printable_flags(struct session *s, struct winlink *wl)
flags[pos++] = '*';
if (wl == TAILQ_FIRST(&s->lastw))
flags[pos++] = '-';
+ if (server_check_marked() && wl == marked_winlink)
+ flags[pos++] = 'M';
if (wl->window->flags & WINDOW_ZOOMED)
flags[pos++] = 'Z';
flags[pos] = '\0';