diff options
author | ZyX <kp-pav@yandex.ru> | 2015-08-18 21:20:48 +0300 |
---|---|---|
committer | ZyX <kp-pav@yandex.ru> | 2015-10-08 22:00:49 +0300 |
commit | 48ba2f0109ad2b5bc51b08c55848d526b37fd8d0 (patch) | |
tree | 41f5f5c9c2dcda4e3e0c07d6f981627127a8c6b4 /runtime | |
parent | 0fe11fe70a1927356bf3c2edc01741c1cd65e614 (diff) | |
download | rneovim-48ba2f0109ad2b5bc51b08c55848d526b37fd8d0.tar.gz rneovim-48ba2f0109ad2b5bc51b08c55848d526b37fd8d0.tar.bz2 rneovim-48ba2f0109ad2b5bc51b08c55848d526b37fd8d0.zip |
documentation/functests: Replace NeoVim with Neovim
Diffstat (limited to 'runtime')
-rw-r--r-- | runtime/doc/starting.txt | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index 2078e9761b..cfd3d2c9d2 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -991,16 +991,16 @@ MERGING *shada-merging* {Nvim} When writing ShaDa files with |:wshada| without bang or at regular exit information in the existing ShaDa file is merged with information from current -NeoVim instance. For this purpose ShaDa files store timestamps associated +Neovim instance. For this purpose ShaDa files store timestamps associated with ShaDa entries. Specifically the following is being done: 1. History lines are merged, ordered by timestamp. Maximum amount of items in ShaDa file is defined by 'shada' option (|shada-/|, |shada-:|, |shada-@|, etc: one suboption for each character that represents history name (|:history|)). -2. Local marks and changes for files that were not opened by NeoVim are copied - to new ShaDa file. Marks for files that were opened by NeoVim are merged, - changes to files opened by NeoVim are ignored. |shada-'| +2. Local marks and changes for files that were not opened by Neovim are copied + to new ShaDa file. Marks for files that were opened by Neovim are merged, + changes to files opened by Neovim are ignored. |shada-'| 3. Jump list is merged: jumps are ordered by timestamp, identical jumps (identical position AND timestamp) are squashed. 4. Search patterns and substitute strings are not merged: search pattern or @@ -1008,14 +1008,14 @@ with ShaDa entries. Specifically the following is being done: to ShaDa file. 5. For each register entity with greatest timestamp is the only saved. |shada-<| -6. All saved variables are saved from current NeoVim instance. Additionally +6. All saved variables are saved from current Neovim instance. Additionally existing variable values are copied, meaning that the only way to remove variable from a ShaDa file is either removing it by hand or disabling writing variables completely. |shada-!| 7. For each global mark entity with greatest timestamp is the only saved. 8. Buffer list and header are the only entries which are not merged in any fashion: the only header and buffer list present are the ones from the - NeoVim instance which was last writing the file. |shada-%| + Neovim instance which was last writing the file. |shada-%| COMPATIBILITY *shada-compatibility* {Nvim} @@ -1040,13 +1040,13 @@ ShaDa files are forward and backward compatible. This means that history types. |history| 6. Unknown keys found in register, local mark, global mark, change, jump and search pattern entries are saved internally and dumped when writing. - Entries created during NeoVim session never have such additions. + Entries created during Neovim session never have such additions. 7. Additional elements found in replacement string and history entries are - saved internally and dumped. Entries created during NeoVim session never + saved internally and dumped. Entries created during Neovim session never have such additions. 8. Additional elements found in variable entries are simply ignored when reading. When writing new variables they will be preserved during merging, - but that's all. Variable values dumped from current NeoVim session never + but that's all. Variable values dumped from current Neovim session never have additional elements, even if variables themselves were obtained by reading ShaDa files. @@ -1074,7 +1074,7 @@ The text in the ShaDa file is UTF-8-encoded. Normally you will always work with the same 'encoding' value, and this works just fine. However, if you read the ShaDa file with value for 'encoding' different from utf-8 and 'encoding' used when writing ShaDa file, some of the text (non-ASCII -characters) may be invalid as NeoVim always attempts to convert the text in +characters) may be invalid as Neovim always attempts to convert the text in the ShaDa file from the UTF-8 to the current 'encoding' value. Filenames are never converted, affected elements are: @@ -1099,7 +1099,7 @@ start with an existing one to get the format right. You need to understand MessagePack (or, more likely, find software that is able to use it) format to do this. This can be useful in order to create a second file, say "~/.my.shada" which could contain certain settings that you always want when -you first start NeoVim. For example, you can preload registers with +you first start Neovim. For example, you can preload registers with particular data, or put certain commands in the command line history. A line in your .nvimrc file like > :rshada! ~/.my.shada @@ -1114,18 +1114,18 @@ that file. This was done to avoid accidentally destroying a file when the file name of the ShaDa file is wrong. This could happen when accidentally typing "nvim -i file" when you wanted "nvim -R file" (yes, somebody accidentally did that!). If you want to overwrite a ShaDa file with an error -in it, you will either have to fix the error, delete the file (while NeoVim is +in it, you will either have to fix the error, delete the file (while Neovim is running, so most of the information will be restored) or write it explicitly with |:wshada| and a bang. *E136* *E138* *shada-error-handling* -Note: when NeoVim finds out that it failed to write part of the ShaDa file +Note: when Neovim finds out that it failed to write part of the ShaDa file (e.g. because there is no space left to write the file) or when it appears that already present ShaDa file contains errors that indicate that this file is likely not a ShaDa file then ShaDa file with `.tmp.X` suffix is left on the file system (where X is any latin small letter: from U+0061 to U+007A). You may use such file to recover the data if you want, but in any case it needs to be cleaned up after you resolve the issue that prevented old ShaDa file from -being overwritten. If NeoVim fails to find unexisting `.tmp.X` file it will +being overwritten. If Neovim fails to find unexisting `.tmp.X` file it will not write ShaDa file at all. Errors which trigger this behaviour are listed at |shada-keeping-tmpfile|. @@ -1188,7 +1188,7 @@ exactly four MessagePack objects: Key Data ~ generator Binary, software used to generate ShaDa file. Is equal to "nvim" when ShaDa file was - written by NeoVim. + written by Neovim. version Binary, generator version. encoding Binary, effective 'encoding' value. max_kbyte Integer, effective |shada-s| limit value. |