===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-paste-buffer.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- src/usr.bin/tmux/cmd-paste-buffer.c	2009/11/04 22:43:11	1.7
+++ src/usr.bin/tmux/cmd-paste-buffer.c	2009/11/13 19:53:29	1.8
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-paste-buffer.c,v 1.7 2009/11/04 22:43:11 nicm Exp $ */
+/* $OpenBSD: cmd-paste-buffer.c,v 1.8 2009/11/13 19:53:29 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -32,7 +32,7 @@
 const struct cmd_entry cmd_paste_buffer_entry = {
 	"paste-buffer", "pasteb",
 	"[-dr] " CMD_BUFFER_WINDOW_USAGE,
-	0, CMD_CHFLAG('d')|CMD_CHFLAG('r'),
+	0, "dr",
 	cmd_buffer_init,
 	cmd_buffer_parse,
 	cmd_paste_buffer_exec,
@@ -64,14 +64,14 @@
 
 	if (pb != NULL && *pb->data != '\0') {
 		/* -r means raw data without LF->CR conversion. */
-		if (data->chflags & CMD_CHFLAG('r'))
+		if (cmd_check_flag(data->chflags, 'r'))
 			bufferevent_write(wp->event, pb->data, pb->size);
 		else
 			cmd_paste_buffer_lf2cr(wp, pb->data, pb->size);
 	}
 
 	/* Delete the buffer if -d. */
-	if (data->chflags & CMD_CHFLAG('d')) {
+	if (cmd_check_flag(data->chflags, 'd')) {
 		if (data->buffer == -1)
 			paste_free_top(&s->buffers);
 		else