From e35f5b35bd9a6a85eb314bfb642998267b2d475d Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Sat, 14 Nov 2009 17:56:39 +0000 Subject: Sync OpenBSD patchset 539: Get rid of the ugly CMD_CHFLAG macro and use a const string (eg "dDU") in the command entry structs and a couple of functions to check/set the flags. --- cmd-next-window.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'cmd-next-window.c') diff --git a/cmd-next-window.c b/cmd-next-window.c index 6d27eaf3..44a0e197 100644 --- a/cmd-next-window.c +++ b/cmd-next-window.c @@ -1,4 +1,4 @@ -/* $Id: cmd-next-window.c,v 1.20 2009-07-28 22:12:16 tcunha Exp $ */ +/* $Id: cmd-next-window.c,v 1.21 2009-11-14 17:56:39 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -30,7 +30,7 @@ int cmd_next_window_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_next_window_entry = { "next-window", "next", "[-a] " CMD_TARGET_SESSION_USAGE, - 0, CMD_CHFLAG('a'), + 0, "a", cmd_next_window_init, cmd_target_parse, cmd_next_window_exec, @@ -47,7 +47,7 @@ cmd_next_window_init(struct cmd *self, int key) data = self->data; if (key == ('n' | KEYC_ESCAPE)) - data->chflags |= CMD_CHFLAG('a'); + cmd_set_flag(&data->chflags, 'a'); } int @@ -61,7 +61,7 @@ cmd_next_window_exec(struct cmd *self, struct cmd_ctx *ctx) return (-1); activity = 0; - if (data->chflags & CMD_CHFLAG('a')) + if (cmd_check_flag(data->chflags, 'a')) activity = 1; if (session_next(s, activity) == 0) -- cgit