diff options
| -rw-r--r-- | runtime/autoload/spellfile.vim | 2 | ||||
| -rw-r--r-- | runtime/doc/job_control.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/msgpack_rpc.txt | 1 | ||||
| -rw-r--r-- | runtime/doc/nvim_provider.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/options.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/starting.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/term.txt | 3 | ||||
| -rw-r--r-- | src/nvim/eval.c | 11 | ||||
| -rw-r--r-- | src/nvim/main.c | 2 | ||||
| -rw-r--r-- | src/nvim/msgpack_rpc/channel.c | 2 |
10 files changed, 14 insertions, 17 deletions
diff --git a/runtime/autoload/spellfile.vim b/runtime/autoload/spellfile.vim index 8024f40bb0..5b1079e919 100644 --- a/runtime/autoload/spellfile.vim +++ b/runtime/autoload/spellfile.vim @@ -197,7 +197,7 @@ endfunc function! spellfile#WritableSpellDir() if has("unix") - " For Unix always use the $HOME/.vim directory + " For Unix always use the $HOME/.nvim directory return $HOME . "/.nvim/spell" endif for dir in split(&rtp, ',') diff --git a/runtime/doc/job_control.txt b/runtime/doc/job_control.txt index b3a95ae7b9..2521132047 100644 --- a/runtime/doc/job_control.txt +++ b/runtime/doc/job_control.txt @@ -83,7 +83,7 @@ Here's what is happening: - The second shell is started with the -c argument, causing it to execute a command then exit. In this case, the command is a for loop that will print 0 through 9 then exit. -- The |JobHandler()| function is called by the `JobActivity` autocommand (notice +- The `JobHandler()` function is called by the `JobActivity` autocommand (notice how the shell* pattern matches the names `shell1` and `shell2` passed to |jobstart()|), and it takes care of displaying stdout/stderr received from the shells. diff --git a/runtime/doc/msgpack_rpc.txt b/runtime/doc/msgpack_rpc.txt index 121b47167b..f3fcd069c4 100644 --- a/runtime/doc/msgpack_rpc.txt +++ b/runtime/doc/msgpack_rpc.txt @@ -74,6 +74,7 @@ There are four ways to open msgpack-rpc streams to nvim: 2. Through the stdin/stdout of a program spawned by the |rpcstart()| function. + *$NVIM_LISTEN_ADDRESS* 3. Through the socket automatically created with each instance. To find out the socket location (which is random by default) from a running nvim instance, one can inspect the |$NVIM_LISTEN_ADDRESS| environment variable: diff --git a/runtime/doc/nvim_provider.txt b/runtime/doc/nvim_provider.txt index cea55a6656..f6c919c592 100644 --- a/runtime/doc/nvim_provider.txt +++ b/runtime/doc/nvim_provider.txt @@ -9,7 +9,7 @@ Nvim provider infrastructure *nvim-provider* First of all, this document is meant to be read by developers interested in contributing to the refactoring effort. If you are a normal user or plugin developer looking to learn about Nvim |msgpack-rpc| infrastructure for -implementing plugins in other programming languages, see |external-plugin|. +implementing plugins in other programming languages, see |remote-plugin|. For instructions on how to enable Python plugins, see |nvim-python|. For clipboard, see |nvim-clipboard|. diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index f1676ab619..627bc4158e 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -5522,7 +5522,7 @@ A jump table for the options with a short description can be found at |Q_op|. $HOME/.vim/after" Macintosh: "$VIM:vimfiles, $VIMRUNTIME, - $VIM:vimfiles:after" + $VIM:vimfiles:after") global {not in Vi} This is a list of directories which will be searched for runtime diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index c34011f35b..c60bf40528 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -57,7 +57,7 @@ filename One or more file names. The first one will be the current that needs to be saved. Except when in readonly mode, then the buffer is not marked modified. Example: > ls | nvim -R - - Starting in Ex mode: > +< Starting in Ex mode: > nvim -e - nvim -E < Start editing in silent mode. See |-s-ex|. @@ -212,7 +212,7 @@ argument. {not in Vi} *-g* --g Start Vim in GUI mode. See |gui|. For the opposite see |-v|. +-g Start Vim in GUI mode. See |gui|. {not in Vi} *-e* diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt index f37ba9b256..18b83d3812 100644 --- a/runtime/doc/term.txt +++ b/runtime/doc/term.txt @@ -25,8 +25,7 @@ NOTE: Most of this is not used when running the |GUI|. 1. Startup *startup-terminal* When Vim is started a default terminal type is assumed. for MS-DOS this is -the pc terminal, for Unix an ansi terminal. A few other terminal types are -always available, see below |builtin-terms|. +the pc terminal, for Unix an ansi terminal. You can give the terminal name with the '-T' Vim argument. If it is not given Vim will try to get the name from the TERM environment variable. diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 9e4b110e8b..08ad33e60e 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -345,13 +345,6 @@ typedef enum { VAR_FLAVOUR_VIMINFO /* all uppercase */ } var_flavour_T; -/* - * Array to hold the value of v: variables. - * The value is in a dictitem, so that it can also be used in the v: scope. - * The reason to use this table anyway is for very quick access to the - * variables with the VV_ defines. - */ - /* values for vv_flags: */ #define VV_COMPAT 1 /* compatible, also used without "v:" */ #define VV_RO 2 /* read-only */ @@ -359,6 +352,10 @@ typedef enum { #define VV_NAME(s, t) s, {{t, 0, {0}}, 0, {0}}, {0} +// Array to hold the value of v: variables. +// The value is in a dictitem, so that it can also be used in the v: scope. +// The reason to use this table anyway is for very quick access to the +// variables with the VV_ defines. static struct vimvar { char *vv_name; /* name of variable, without v: */ dictitem_T vv_di; /* value and name for key */ diff --git a/src/nvim/main.c b/src/nvim/main.c index d2d252a425..9f4bc22ae0 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -1961,7 +1961,7 @@ static void mainerr(int n, const char *str) } -/// Prints help message and exits; used for 'nvim -h' & 'nvim --help' +/// Prints help message for "nvim -h" or "nvim --help" and exits. static void usage(void) { signal_stop(); // kill us with CTRL-C here, if you like diff --git a/src/nvim/msgpack_rpc/channel.c b/src/nvim/msgpack_rpc/channel.c index 25d41e7328..e8dab05ba0 100644 --- a/src/nvim/msgpack_rpc/channel.c +++ b/src/nvim/msgpack_rpc/channel.c @@ -723,7 +723,7 @@ static void complete_call(msgpack_object *obj, Channel *channel) static void call_set_error(Channel *channel, char *msg) { - ELOG("Msgpack-RPC error: %s", msg); + ELOG("msgpack-rpc: %s", msg); for (size_t i = 0; i < kv_size(channel->call_stack); i++) { ChannelCallFrame *frame = kv_A(channel->call_stack, i); frame->returned = true; |