From b0b30769951963bd439d45586a0c86bba445d6ee Mon Sep 17 00:00:00 2001 From: Michael Reed Date: Mon, 11 May 2015 17:30:18 -0400 Subject: main.c: Make '-v' synonymous with '--version' This is done for consistency with '-h' and '--help'. While here, also move the mch_exit() call out of usage to make it clear what is being done. Helped-by: Justin M. Keyes --- src/nvim/main.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/nvim/main.c b/src/nvim/main.c index 3120caa782..64d40f9aa6 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -901,14 +901,11 @@ static void command_line_scan(mparm_T *parmp) /* "--literal" take files literally */ /* "--noplugin[s]" skip plugins */ /* "--cmd " execute cmd before vimrc */ - if (STRICMP(argv[0] + argv_idx, "help") == 0) + if (STRICMP(argv[0] + argv_idx, "help") == 0) { usage(); - else if (STRICMP(argv[0] + argv_idx, "version") == 0) { - Columns = 80; /* need to init Columns */ - info_message = TRUE; /* use mch_msg(), not mch_errmsg() */ - list_version(); - msg_putchar('\n'); - msg_didout = FALSE; + mch_exit(0); + } else if (STRICMP(argv[0] + argv_idx, "version") == 0) { + version(); mch_exit(0); } else if (STRICMP(argv[0] + argv_idx, "api-info") == 0) { msgpack_sbuffer* b = msgpack_sbuffer_new(); @@ -981,7 +978,7 @@ static void command_line_scan(mparm_T *parmp) case 'h': /* "-h" give help message */ usage(); - break; + mch_exit(0); case 'H': /* "-H" start in Hebrew mode: rl + hkmap set */ p_hkmap = TRUE; @@ -1083,6 +1080,9 @@ static void command_line_scan(mparm_T *parmp) case 'd': /* "-d" 'diff' */ parmp->diff_mode = TRUE; break; + case 'v': + version(); + mch_exit(0); case 'V': /* "-V{N}" Verbose level */ /* default is 10: a little bit verbose */ p_verbose = get_number_arg(argv[0], &argv_idx, 10); @@ -1959,8 +1959,16 @@ static void mainerr(int n, const char *str) mch_exit(1); } +/// Prints version information for "nvim -v" or "nvim --version". +static void version(void) +{ + info_message = TRUE; // use mch_msg(), not mch_errmsg() + list_version(); + msg_putchar('\n'); + msg_didout = FALSE; +} -/// Prints help message for "nvim -h" or "nvim --help" and exits. +/// Prints help message for "nvim -h" or "nvim --help". static void usage(void) { signal_stop(); // kill us with CTRL-C here, if you like @@ -2012,10 +2020,8 @@ static void usage(void) mch_msg(_(" --api-info Dump API metadata serialized to msgpack and exit\n")); mch_msg(_(" --embed Use stdin/stdout as a msgpack-rpc channel\n")); mch_msg(_(" --headless Don't start a user interface\n")); - mch_msg(_(" --version Print version information and exit\n")); + mch_msg(_(" -v, --version Print version information and exit\n")); mch_msg(_(" -h | --help Print this help message and exit\n")); - - mch_exit(0); } -- cgit From 3a3a6bee0d58dce1ef0d16ddcfa1663dd5548f5e Mon Sep 17 00:00:00 2001 From: Michael Reed Date: Mon, 11 May 2015 17:30:19 -0400 Subject: `nvim --help` text: Unify with manpages --- src/nvim/main.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/nvim/main.c b/src/nvim/main.c index 64d40f9aa6..ce96d2a7bf 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -1987,41 +1987,42 @@ static void usage(void) mch_msg(_(" -E Improved Ex mode\n")); mch_msg(_(" -s Silent (batch) mode (only for ex mode)\n")); mch_msg(_(" -d Diff mode\n")); - mch_msg(_(" -R Readonly mode\n")); + mch_msg(_(" -R Read-only mode\n")); mch_msg(_(" -Z Restricted mode\n")); mch_msg(_(" -m Modifications (writing files) not allowed\n")); mch_msg(_(" -M Modifications in text not allowed\n")); mch_msg(_(" -b Binary mode\n")); mch_msg(_(" -l Lisp mode\n")); + mch_msg(_(" -A Arabic mode\n")); + mch_msg(_(" -F Farsi mode\n")); + mch_msg(_(" -H Hebrew mode\n")); mch_msg(_(" -V[N][file] Be verbose [level N][log messages to file]\n")); mch_msg(_(" -D Debugging mode\n")); mch_msg(_(" -n No swap file, use memory only\n")); - mch_msg(_(" -r List swap files and exit\n")); + mch_msg(_(" -r, -L List swap files and exit\n")); mch_msg(_(" -r Recover crashed session\n")); - mch_msg(_(" -A Start in Arabic mode\n")); - mch_msg(_(" -F Start in Farsi mode\n")); - mch_msg(_(" -H Start in Hebrew mode\n")); mch_msg(_(" -T Set terminal type to \n")); - mch_msg(_(" -u Use instead of any .nvimrc\n")); + mch_msg(_(" -u Use instead of the default\n")); + mch_msg(_(" -i Use instead of the default\n")); mch_msg(_(" --noplugin Don't load plugin scripts\n")); - mch_msg(_(" -p[N] Open N tab pages (default: one for each file)\n")); mch_msg(_(" -o[N] Open N windows (default: one for each file)\n")); mch_msg(_(" -O[N] Like -o but split vertically\n")); + mch_msg(_(" -p[N] Open N tab pages (default: one for each file)\n")); mch_msg(_(" + Start at end of file\n")); - mch_msg(_(" + Start at line \n")); + mch_msg(_(" + Start at line \n")); + mch_msg(_(" +/ Start at first occurrence of \n")); mch_msg(_(" --cmd Execute before loading any nvimrc\n")); mch_msg(_(" -c Execute after loading the first file\n")); - mch_msg(_(" -S Source file after loading the first file\n")); - mch_msg(_(" -s Read Normal mode commands from file \n")); - mch_msg(_(" -w Append all typed commands to file \n")); - mch_msg(_(" -W Write all typed commands to file \n")); + mch_msg(_(" -S Source after loading the first file\n")); + mch_msg(_(" -s Read Normal mode commands from \n")); + mch_msg(_(" -w Append all typed characters to \n")); + mch_msg(_(" -W Write all typed characters to \n")); mch_msg(_(" --startuptime Write startup timing messages to \n")); - mch_msg(_(" -i Use instead of .nviminfo\n")); mch_msg(_(" --api-info Dump API metadata serialized to msgpack and exit\n")); mch_msg(_(" --embed Use stdin/stdout as a msgpack-rpc channel\n")); mch_msg(_(" --headless Don't start a user interface\n")); mch_msg(_(" -v, --version Print version information and exit\n")); - mch_msg(_(" -h | --help Print this help message and exit\n")); + mch_msg(_(" -h, --help Print this help message and exit\n")); } -- cgit