From 9887127b03523097957a48657a130c0999574f1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= Date: Thu, 29 Sep 2016 22:41:37 +0200 Subject: sam: consistent argument handling for :r, :w, :e commands :e without any argument can be used to reload the file from disk whereas before a "Filename expected" error would be displayed. --- vis-cmds.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'vis-cmds.c') diff --git a/vis-cmds.c b/vis-cmds.c index ea6ed8c..87ebd67 100644 --- a/vis-cmds.c +++ b/vis-cmds.c @@ -326,6 +326,10 @@ static void info_unsaved_changes(Vis *vis) { } static bool cmd_edit(Vis *vis, Win *win, Command *cmd, const char *argv[], Cursor *cur, Filerange *range) { + if (argv[2]) { + vis_info_show(vis, "Only 1 filename allowed"); + return false; + } Win *oldwin = win; if (!oldwin) return false; @@ -520,13 +524,12 @@ static bool print_action(const char *key, void *value, void *data) { static bool print_cmd(const char *key, void *value, void *data) { char help[256]; CommandDef *cmd = value; - snprintf(help, sizeof help, "%s%s%s%s%s%s%s%s", + snprintf(help, sizeof help, "%s%s%s%s%s%s%s", cmd->name, (cmd->flags & CMD_FORCE) ? "[!]" : "", (cmd->flags & CMD_TEXT) ? "/text/" : "", (cmd->flags & CMD_REGEX) ? "/regexp/" : "", (cmd->flags & CMD_CMD) ? " command" : "", - (cmd->flags & CMD_FILE) ? " file-name" : "", (cmd->flags & CMD_SHELL) ? (!strcmp(cmd->name, "s") ? "/regexp/text/" : " shell-command") : "", (cmd->flags & CMD_ARGV) ? " [args...]" : ""); return text_appendf(data, " %-30s %s\n", help, cmd->help); -- cgit v1.2.3