diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2021-11-11 09:31:17 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2021-11-11 09:31:17 +0000 |
| commit | f3c063602a6265afd01ed01bc163ccaf60f329ac (patch) | |
| tree | 196aa81f162df4ae0427d0c6448da0335e1f3208 /usr.bin/tmux/input.c | |
| parent | ffa5e97918b7e253fcaa562b31ba76926612e5a0 (diff) | |
If automatic-rename is off, allow the escape sequence to set an empty
window name, GitHub issue 2964.
Diffstat (limited to 'usr.bin/tmux/input.c')
| -rw-r--r-- | usr.bin/tmux/input.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/usr.bin/tmux/input.c b/usr.bin/tmux/input.c index b057e51c949..fc00c3200a0 100644 --- a/usr.bin/tmux/input.c +++ b/usr.bin/tmux/input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: input.c,v 1.195 2021/11/03 13:37:17 nicm Exp $ */ +/* $OpenBSD: input.c,v 1.196 2021/11/11 09:31:16 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -2382,6 +2382,7 @@ static void input_exit_rename(struct input_ctx *ictx) { struct window_pane *wp = ictx->wp; + struct window *w; struct options_entry *o; if (wp == NULL) @@ -2394,17 +2395,20 @@ input_exit_rename(struct input_ctx *ictx) if (!utf8_isvalid(ictx->input_buf)) return; + w = wp->window; if (ictx->input_len == 0) { - o = options_get_only(wp->window->options, "automatic-rename"); + o = options_get_only(w->options, "automatic-rename"); if (o != NULL) options_remove_or_default(o, -1, NULL); - return; + if (!options_get_number(w->options, "automatic-rename")) + window_set_name(w, ""); + } else { + options_set_number(w->options, "automatic-rename", 0); + window_set_name(w, ictx->input_buf); } - window_set_name(wp->window, ictx->input_buf); - options_set_number(wp->window->options, "automatic-rename", 0); - server_redraw_window_borders(wp->window); - server_status_window(wp->window); + server_redraw_window_borders(w); + server_status_window(w); } /* Open UTF-8 character. */ |