aboutsummaryrefslogtreecommitdiff
path: root/input.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2015-10-27 23:27:26 +0000
committerThomas Adam <thomas@xteddy.org>2015-10-27 23:27:26 +0000
commitda1f6fc2c8477c99e986061bcdd7c3e854a60076 (patch)
treef5934e2f96c43f80bad7e3a219230d6337c9d208 /input.c
parent147b5ae5145dc29e9bf4d0ebbc635939b6fdc60b (diff)
parent44657bf932b068aff5ce1019a4e8a2e7b00b5321 (diff)
downloadrtmux-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 'input.c')
-rw-r--r--input.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/input.c b/input.c
index ab56fc38..3a02b0ce 100644
--- a/input.c
+++ b/input.c
@@ -1907,12 +1907,12 @@ input_exit_rename(struct input_ctx *ictx)
{
if (ictx->flags & INPUT_DISCARD)
return;
- if (!options_get_number(&ictx->wp->window->options, "allow-rename"))
+ if (!options_get_number(ictx->wp->window->options, "allow-rename"))
return;
log_debug("%s: \"%s\"", __func__, ictx->input_buf);
window_set_name(ictx->wp->window, ictx->input_buf);
- options_set_number(&ictx->wp->window->options, "automatic-rename", 0);
+ options_set_number(ictx->wp->window->options, "automatic-rename", 0);
server_status_window(ictx->wp->window);
}
@@ -1921,7 +1921,7 @@ input_exit_rename(struct input_ctx *ictx)
int
input_utf8_open(struct input_ctx *ictx)
{
- if (!options_get_number(&ictx->wp->window->options, "utf8")) {
+ if (!options_get_number(ictx->wp->window->options, "utf8")) {
/* Print, and do not switch state. */
input_print(ictx);
return (-1);