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.

1 files changed, 3 insertions, 3 deletions

diff --git a/cmd-copy-mode.c b/cmd-copy-mode.c
index fda19efb..48cdd656 100644
--- a/cmd-copy-mode.c
+++ b/cmd-copy-mode.c
@@ -30,7 +30,7 @@ int	cmd_copy_mode_exec(struct cmd *, struct cmd_ctx *);
 const struct cmd_entry cmd_copy_mode_entry = {
 	"copy-mode", NULL,
 	"[-u] " CMD_TARGET_PANE_USAGE,
-	0, CMD_CHFLAG('u'),
+	0, "u",
 	cmd_copy_mode_init,
 	cmd_target_parse,
 	cmd_copy_mode_exec,
@@ -48,7 +48,7 @@ cmd_copy_mode_init(struct cmd *self, int key)
 
 	switch (key) {
 	case KEYC_PPAGE:
-		data->chflags |= CMD_CHFLAG('u');
+		cmd_set_flag(&data->chflags, 'u');
 		break;
 	}
 }
@@ -63,7 +63,7 @@ cmd_copy_mode_exec(struct cmd *self, struct cmd_ctx *ctx)
 		return (-1);
 
 	window_pane_set_mode(wp, &window_copy_mode);
-	if (wp->mode == &window_copy_mode && data->chflags & CMD_CHFLAG('u'))
+	if (wp->mode == &window_copy_mode && cmd_check_flag(data->chflags, 'u'))
 		window_copy_pageup(wp);
 
 	return (0);