diff options
| author | nicm <nicm> | 2015-11-12 11:09:11 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2015-11-12 11:09:11 +0000 |
| commit | 1b86f520ea1620628e569ea833c7b13306c18a4e (patch) | |
| tree | 02c4aa83f31f42b1128171e9b6a0a566e564e416 /window-choose.c | |
| parent | a0f3999ce7b6df32324b493fa3c8007de93d2c48 (diff) | |
| download | rtmux-1b86f520ea1620628e569ea833c7b13306c18a4e.tar.gz rtmux-1b86f520ea1620628e569ea833c7b13306c18a4e.tar.bz2 rtmux-1b86f520ea1620628e569ea833c7b13306c18a4e.zip | |
Nuke the utf8 and status-utf8 options and make tmux only a UTF-8
terminal. We still support non-UTF-8 terminals outside tmux, but inside
it is always UTF-8 (as when the utf8 and status-utf8 options were on).
Diffstat (limited to 'window-choose.c')
| -rw-r--r-- | window-choose.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/window-choose.c b/window-choose.c index fa0e95c8..5f406c78 100644 --- a/window-choose.c +++ b/window-choose.c @@ -754,13 +754,12 @@ window_choose_write_line(struct window_pane *wp, struct screen_write_ctx *ctx, struct grid_cell gc; size_t last, xoff = 0; char hdr[32], label[32]; - int utf8flag, key; + int key; if (data->callbackfn == NULL) fatalx("called before callback assigned"); last = screen_size_y(s) - 1; - utf8flag = options_get_number(wp->window->options, "utf8"); memcpy(&gc, &grid_default_cell, sizeof gc); if (data->selected == data->top + py) style_apply(&gc, oo, "mode-style"); @@ -777,7 +776,7 @@ window_choose_write_line(struct window_pane *wp, struct screen_write_ctx *ctx, xsnprintf(label, sizeof label, "(%c)", key); else xsnprintf(label, sizeof label, "(%d)", item->pos); - screen_write_nputs(ctx, screen_size_x(s) - 1, &gc, utf8flag, + screen_write_nputs(ctx, screen_size_x(s) - 1, &gc, "%*s %s %s", data->width + 2, label, /* * Add indication to tree if necessary about whether it's |