diff options
| author | Thiago de Arruda <tpadilha84@gmail.com> | 2014-09-09 14:11:05 -0300 |
|---|---|---|
| committer | Thiago de Arruda <tpadilha84@gmail.com> | 2014-09-12 13:25:28 -0300 |
| commit | af61a286b20b8435e016d6210b99e642cd59df8c (patch) | |
| tree | c0728d38761fbafa16bea295a454d5b6c211601e | |
| parent | cac24cb06ddcad0cfb3a9379c3bdd0e8706602f9 (diff) | |
| download | rneovim-af61a286b20b8435e016d6210b99e642cd59df8c.tar.gz rneovim-af61a286b20b8435e016d6210b99e642cd59df8c.tar.bz2 rneovim-af61a286b20b8435e016d6210b99e642cd59df8c.zip | |
main: Rename --embedded-mode and --api-msgpack-metadata options
--embedded-mode -> --embed
--api-msgpack-metadata -> --api-info
| -rw-r--r-- | .ci/api-python.sh | 2 | ||||
| -rw-r--r-- | src/nvim/main.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/.ci/api-python.sh b/.ci/api-python.sh index a3e9b652a6..acdbcc2666 100644 --- a/.ci/api-python.sh +++ b/.ci/api-python.sh @@ -23,7 +23,7 @@ fi valgrind_check "$tmpdir" -export NVIM_SPAWN_ARGV="[\"valgrind\", \"-q\", \"--track-origins=yes\", \"--leak-check=yes\", \"--suppressions=$suppressions\", \"--log-file=$tmpdir/valgrind-%p.log\", \"../build/bin/nvim\", \"-u\", \"NONE\", \"--embedded-mode\"]" +export NVIM_SPAWN_ARGV="[\"valgrind\", \"-q\", \"--track-origins=yes\", \"--leak-check=yes\", \"--suppressions=$suppressions\", \"--log-file=$tmpdir/valgrind-%p.log\", \"../build/bin/nvim\", \"-u\", \"NONE\", \"--embed\"]" if ! nosetests --verbosity=2 --nologcapture; then valgrind_check "$tmpdir" exit 1 diff --git a/src/nvim/main.c b/src/nvim/main.c index ebd9f7f3ff..4b440ba92a 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -1026,12 +1026,12 @@ static void command_line_scan(mparm_T *parmp) msg_putchar('\n'); msg_didout = FALSE; mch_exit(0); - } else if (STRICMP(argv[0] + argv_idx, "api-msgpack-metadata") == 0) { + } else if (STRICMP(argv[0] + argv_idx, "api-info") == 0) { for (unsigned int i = 0; i<msgpack_metadata_size; i++) { putchar(msgpack_metadata[i]); } mch_exit(0); - } else if (STRICMP(argv[0] + argv_idx, "embedded-mode") == 0) { + } else if (STRICMP(argv[0] + argv_idx, "embed") == 0) { embedded_mode = true; } else if (STRNICMP(argv[0] + argv_idx, "literal", 7) == 0) { #if !defined(UNIX) @@ -2212,8 +2212,8 @@ static void usage(void) main_msg(_("-W <scriptout>\tWrite all typed commands to file <scriptout>")); main_msg(_("--startuptime <file>\tWrite startup timing messages to <file>")); main_msg(_("-i <viminfo>\t\tUse <viminfo> instead of .viminfo")); - main_msg(_("--api-msgpack-metadata\tDump API metadata information and exit")); - main_msg(_("--embedded-mode\tUse stdin/stdout as a msgpack-rpc channel. " + main_msg(_("--api-info\t\tDump API metadata serialized to msgpack and exit")); + main_msg(_("--embed\t\tUse stdin/stdout as a msgpack-rpc channel. " "This can be used for embedding Neovim into other programs")); main_msg(_("-h or --help\tPrint Help (this message) and exit")); main_msg(_("--version\t\tPrint version information and exit")); |