diff options
| -rw-r--r-- | cmd-command-prompt.c | 4 | ||||
| -rw-r--r-- | cmd-generic.c | 6 | ||||
| -rw-r--r-- | cmd-rename-session.c | 4 | ||||
| -rw-r--r-- | cmd-rename-window.c | 4 | ||||
| -rw-r--r-- | cmd-resize-pane-down.c | 4 | ||||
| -rw-r--r-- | cmd-resize-pane-up.c | 4 | ||||
| -rw-r--r-- | cmd-respawn-window.c | 4 | ||||
| -rw-r--r-- | cmd-save-buffer.c | 4 | ||||
| -rw-r--r-- | cmd-set-buffer.c | 4 | ||||
| -rw-r--r-- | tmux.h | 6 |
10 files changed, 22 insertions, 22 deletions
diff --git a/cmd-command-prompt.c b/cmd-command-prompt.c index f5a1d271..72c13fd0 100644 --- a/cmd-command-prompt.c +++ b/cmd-command-prompt.c @@ -1,4 +1,4 @@ -/* $Id: cmd-command-prompt.c,v 1.8 2009-01-13 01:08:40 nicm Exp $ */ +/* $Id: cmd-command-prompt.c,v 1.9 2009-01-14 22:16:56 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> @@ -35,7 +35,7 @@ int cmd_command_prompt_callback(void *, const char *); const struct cmd_entry cmd_command_prompt_entry = { "command-prompt", NULL, CMD_TARGET_CLIENT_USAGE " [template]", - CMD_ZEROONEARG, + CMD_ARG01, cmd_command_prompt_init, cmd_target_parse, cmd_command_prompt_exec, diff --git a/cmd-generic.c b/cmd-generic.c index 75e7ea3b..b0f41ea6 100644 --- a/cmd-generic.c +++ b/cmd-generic.c @@ -1,4 +1,4 @@ -/* $Id: cmd-generic.c,v 1.20 2009-01-12 19:23:14 nicm Exp $ */ +/* $Id: cmd-generic.c,v 1.21 2009-01-14 22:16:56 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> @@ -90,14 +90,14 @@ cmd_fill_argument(int flags, char **arg, int argc, char **argv) { *arg = NULL; - if (flags & CMD_ONEARG) { + if (flags & CMD_ARG1) { if (argc != 1) return (-1); *arg = xstrdup(argv[0]); return (0); } - if (flags & CMD_ZEROONEARG) { + if (flags & CMD_ARG01) { if (argc != 0 && argc != 1) return (-1); if (argc == 1) diff --git a/cmd-rename-session.c b/cmd-rename-session.c index 6a5ed884..13f7b485 100644 --- a/cmd-rename-session.c +++ b/cmd-rename-session.c @@ -1,4 +1,4 @@ -/* $Id: cmd-rename-session.c,v 1.13 2008-12-10 20:25:41 nicm Exp $ */ +/* $Id: cmd-rename-session.c,v 1.14 2009-01-14 22:16:56 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -31,7 +31,7 @@ void cmd_rename_session_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_rename_session_entry = { "rename-session", "rename", CMD_TARGET_SESSION_USAGE " new-name", - CMD_ONEARG, + CMD_ARG1, cmd_target_init, cmd_target_parse, cmd_rename_session_exec, diff --git a/cmd-rename-window.c b/cmd-rename-window.c index bcbdacf4..1180414a 100644 --- a/cmd-rename-window.c +++ b/cmd-rename-window.c @@ -1,4 +1,4 @@ -/* $Id: cmd-rename-window.c,v 1.23 2008-12-10 20:25:41 nicm Exp $ */ +/* $Id: cmd-rename-window.c,v 1.24 2009-01-14 22:16:57 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -31,7 +31,7 @@ void cmd_rename_window_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_rename_window_entry = { "rename-window", "renamew", CMD_TARGET_WINDOW_USAGE " new-name", - CMD_ONEARG, + CMD_ARG1, cmd_target_init, cmd_target_parse, cmd_rename_window_exec, diff --git a/cmd-resize-pane-down.c b/cmd-resize-pane-down.c index edc63f06..6ec2b5b9 100644 --- a/cmd-resize-pane-down.c +++ b/cmd-resize-pane-down.c @@ -1,4 +1,4 @@ -/* $Id: cmd-resize-pane-down.c,v 1.4 2009-01-14 22:13:30 nicm Exp $ */ +/* $Id: cmd-resize-pane-down.c,v 1.5 2009-01-14 22:16:57 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> @@ -32,7 +32,7 @@ void cmd_resize_pane_down_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_resize_pane_down_entry = { "resize-pane-down", "resizep-down", CMD_PANE_WINDOW_USAGE " [adjustment]", - CMD_ZEROONEARG|CMD_CANREPEAT, + CMD_ARG01|CMD_CANREPEAT, cmd_resize_pane_down_init, cmd_pane_parse, cmd_resize_pane_down_exec, diff --git a/cmd-resize-pane-up.c b/cmd-resize-pane-up.c index 81f1fef2..b89c39a0 100644 --- a/cmd-resize-pane-up.c +++ b/cmd-resize-pane-up.c @@ -1,4 +1,4 @@ -/* $Id: cmd-resize-pane-up.c,v 1.4 2009-01-14 22:13:30 nicm Exp $ */ +/* $Id: cmd-resize-pane-up.c,v 1.5 2009-01-14 22:16:57 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> @@ -32,7 +32,7 @@ void cmd_resize_pane_up_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_resize_pane_up_entry = { "resize-pane-up", "resizep-up", CMD_PANE_WINDOW_USAGE " [adjustment]", - CMD_ZEROONEARG|CMD_CANREPEAT, + CMD_ARG01|CMD_CANREPEAT, cmd_resize_pane_up_init, cmd_pane_parse, cmd_resize_pane_up_exec, diff --git a/cmd-respawn-window.c b/cmd-respawn-window.c index 7b52d493..a89a8f0a 100644 --- a/cmd-respawn-window.c +++ b/cmd-respawn-window.c @@ -1,4 +1,4 @@ -/* $Id: cmd-respawn-window.c,v 1.10 2009-01-14 19:29:32 nicm Exp $ */ +/* $Id: cmd-respawn-window.c,v 1.11 2009-01-14 22:16:57 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> @@ -31,7 +31,7 @@ void cmd_respawn_window_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_respawn_window_entry = { "respawn-window", "respawnw", "[-k] " CMD_TARGET_WINDOW_USAGE " [command]", - CMD_ZEROONEARG|CMD_KFLAG, + CMD_ARG01|CMD_KFLAG, cmd_target_init, cmd_target_parse, cmd_respawn_window_exec, diff --git a/cmd-save-buffer.c b/cmd-save-buffer.c index 0c545df6..9d6a026e 100644 --- a/cmd-save-buffer.c +++ b/cmd-save-buffer.c @@ -1,4 +1,4 @@ -/* $Id: cmd-save-buffer.c,v 1.1 2009-01-11 23:14:57 nicm Exp $ */ +/* $Id: cmd-save-buffer.c,v 1.2 2009-01-14 22:16:57 nicm Exp $ */ /* * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org> @@ -33,7 +33,7 @@ void cmd_save_buffer_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_save_buffer_entry = { "save-buffer", "saveb", "[-a] " CMD_BUFFER_SESSION_USAGE " path", - CMD_AFLAG|CMD_ONEARG, + CMD_AFLAG|CMD_ARG1, cmd_buffer_init, cmd_buffer_parse, cmd_save_buffer_exec, diff --git a/cmd-set-buffer.c b/cmd-set-buffer.c index db4c0bed..9f93afe4 100644 --- a/cmd-set-buffer.c +++ b/cmd-set-buffer.c @@ -1,4 +1,4 @@ -/* $Id: cmd-set-buffer.c,v 1.4 2008-12-10 20:25:41 nicm Exp $ */ +/* $Id: cmd-set-buffer.c,v 1.5 2009-01-14 22:16:57 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -31,7 +31,7 @@ void cmd_set_buffer_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_set_buffer_entry = { "set-buffer", "setb", CMD_BUFFER_SESSION_USAGE " data", - CMD_ONEARG, + CMD_ARG1, cmd_buffer_init, cmd_buffer_parse, cmd_set_buffer_exec, @@ -1,4 +1,4 @@ -/* $Id: tmux.h,v 1.233 2009-01-14 22:13:30 nicm Exp $ */ +/* $Id: tmux.h,v 1.234 2009-01-14 22:16:57 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -813,8 +813,8 @@ struct cmd_entry { #define CMD_STARTSERVER 0x1 #define CMD_CANTNEST 0x2 -#define CMD_ONEARG 0x4 -#define CMD_ZEROONEARG 0x8 +#define CMD_ARG1 0x4 +#define CMD_ARG01 0x8 #define CMD_CANREPEAT 0x10 #define CMD_KFLAG 0x10 #define CMD_DFLAG 0x20 |