diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-10-27 23:27:26 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-10-27 23:27:26 +0000 |
| commit | da1f6fc2c8477c99e986061bcdd7c3e854a60076 (patch) | |
| tree | f5934e2f96c43f80bad7e3a219230d6337c9d208 /window-choose.c | |
| parent | 147b5ae5145dc29e9bf4d0ebbc635939b6fdc60b (diff) | |
| parent | 44657bf932b068aff5ce1019a4e8a2e7b00b5321 (diff) | |
| download | rtmux-da1f6fc2c8477c99e986061bcdd7c3e854a60076.tar.gz rtmux-da1f6fc2c8477c99e986061bcdd7c3e854a60076.tar.bz2 rtmux-da1f6fc2c8477c99e986061bcdd7c3e854a60076.zip | |
Merge branch 'obsd-master'
Conflicts:
Makefile
client.c
server-client.c
server.c
tmux.c
tmux.h
Diffstat (limited to 'window-choose.c')
| -rw-r--r-- | window-choose.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/window-choose.c b/window-choose.c index 37baf0d7..f1c3f94a 100644 --- a/window-choose.c +++ b/window-choose.c @@ -169,7 +169,7 @@ window_choose_init(struct window_pane *wp) screen_init(s, screen_size_x(&wp->base), screen_size_y(&wp->base), 0); s->mode &= ~MODE_CURSOR; - keys = options_get_number(&wp->window->options, "mode-keys"); + keys = options_get_number(wp->window->options, "mode-keys"); if (keys == MODEKEY_EMACS) mode_key_init(&data->mdata, &mode_key_tree_emacs_choice); else @@ -748,7 +748,7 @@ window_choose_write_line( { struct window_choose_mode_data *data = wp->modedata; struct window_choose_mode_item *item; - struct options *oo = &wp->window->options; + struct options *oo = wp->window->options; struct screen *s = &data->screen; struct grid_cell gc; size_t last, xoff = 0; @@ -759,7 +759,7 @@ window_choose_write_line( fatalx("called before callback assigned"); last = screen_size_y(s) - 1; - utf8flag = options_get_number(&wp->window->options, "utf8"); + 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"); |