=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v retrieving revision 1.607 retrieving revision 1.608 diff -u -r1.607 -r1.608 --- src/usr.bin/tmux/tmux.h 2015/12/13 18:31:47 1.607 +++ src/usr.bin/tmux/tmux.h 2015/12/13 21:53:57 1.608 @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.h,v 1.607 2015/12/13 18:31:47 nicm Exp $ */ +/* $OpenBSD: tmux.h,v 1.608 2015/12/13 21:53:57 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -1389,14 +1389,16 @@ /* Command definition. */ struct cmd_entry { - const char *name; - const char *alias; + const char *name; + const char *alias; - const char *args_template; - int args_lower; - int args_upper; + struct { + const char *template; + int lower; + int upper; + } args; - const char *usage; + const char *usage; #define CMD_STARTSERVER 0x1 #define CMD_READONLY 0x2 @@ -1418,9 +1420,9 @@ #define CMD_WINDOW_MARKED_T 0x20000 #define CMD_WINDOW_MARKED_S 0x40000 #define CMD_CLIENT_CANFAIL 0x80000 - int flags; + int flags; - enum cmd_retval (*exec)(struct cmd *, struct cmd_q *); + enum cmd_retval (*exec)(struct cmd *, struct cmd_q *); }; #define CMD_ALL_T (CMD_SESSION_T|CMD_WINDOW_T|CMD_PANE_T|CMD_INDEX_T| \ CMD_MOVEW_R|CMD_PANE_MARKED_T|CMD_WINDOW_MARKED_T)