===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-move-window.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- src/usr.bin/tmux/cmd-move-window.c	2009/07/13 17:47:46	1.2
+++ src/usr.bin/tmux/cmd-move-window.c	2009/07/13 23:11:35	1.3
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-move-window.c,v 1.2 2009/07/13 17:47:46 nicm Exp $ */
+/* $OpenBSD: cmd-move-window.c,v 1.3 2009/07/13 23:11:35 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -31,7 +31,7 @@
 const struct cmd_entry cmd_move_window_entry = {
 	"move-window", "movew",
 	"[-dk] " CMD_SRCDST_WINDOW_USAGE,
-	CMD_DFLAG|CMD_KFLAG,
+	0, CMD_CHFLAG('d')|CMD_CHFLAG('k'),
 	cmd_srcdst_init,
 	cmd_srcdst_parse,
 	cmd_move_window_exec,
@@ -64,7 +64,7 @@
 		if (wl_dst->window == wl_src->window)
 			return (0);
 
-		if (data->flags & CMD_KFLAG) {
+		if (data->chflags & CMD_CHFLAG('k')) {
 			/*
 			 * Can't use session_detach as it will destroy session
 			 * if this makes it empty.
@@ -75,7 +75,7 @@
 
 			/* Force select/redraw if current. */
 			if (wl_dst == dst->curw) {
-				data->flags &= ~CMD_DFLAG;
+				data->chflags &= ~CMD_CHFLAG('d');
 				dst->curw = NULL;
 			}
 		}
@@ -100,7 +100,7 @@
 			server_redraw_client(c);
 	}
 
-	if (data->flags & CMD_DFLAG)
+	if (data->chflags & CMD_CHFLAG('d'))
 		server_status_session(dst);
 	else {
 		session_select(dst, wl_dst->idx);