diff options
| author | James McCoy <jamessan@jamessan.com> | 2017-01-02 14:09:48 -0500 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2017-01-09 20:23:41 -0500 |
| commit | 492f2cfeff9a8ed295d2cbf3f4197a91654e07ca (patch) | |
| tree | ade9f538d71baa31f1637a43101ffc46be350e63 /runtime | |
| parent | 282109c51b557bbd5d4fafb3f543613748831040 (diff) | |
| download | rneovim-492f2cfeff9a8ed295d2cbf3f4197a91654e07ca.tar.gz rneovim-492f2cfeff9a8ed295d2cbf3f4197a91654e07ca.tar.bz2 rneovim-492f2cfeff9a8ed295d2cbf3f4197a91654e07ca.zip | |
vim-patch:7.4.1925
Problem: Viminfo does not merge file marks properly.
Solution: Use a timestamp. Add the :clearjumps command.
https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/doc/eval.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/starting.txt | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index c147dbebd4..3f8c6913df 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -3534,7 +3534,7 @@ foreground() Move the Vim window to the foreground. Useful when sent from {only in the Win32 GUI and console version} - *function()* *E700* *E922* *E929* + *function()* *E700* *E922* *E923* function({name} [, {arglist}] [, {dict}]) Return a |Funcref| variable that refers to function {name}. {name} can be a user defined function or an internal function. diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index bbc0260ffa..69e3e8c64b 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -1135,7 +1135,7 @@ files for different types of files (e.g., C code) and load them based on the file name, using the ":autocmd" command (see |:autocmd|). More information on ShaDa file format is contained in |shada-format| section. - *E136* *E138* *shada-error-handling* + *E136* *E929* *shada-error-handling* Some errors make Neovim leave temporary file named `{basename}.tmp.X` (X is any free letter from `a` to `z`) while normally it will create this file, write to it and then rename `{basename}.tmp.X` to `{basename}`. Such errors @@ -1155,7 +1155,7 @@ include: Do not forget to remove the temporary file or replace the target file with temporary one after getting one of the above errors or all attempts to create -a ShaDa file may fail with |E138|. If you got one of them when using +a ShaDa file may fail with |E929|. If you got one of them when using |:wshada| (and not when exiting Neovim: i.e. when you have Neovim session running) you have additional options: @@ -1187,7 +1187,7 @@ running) you have additional options: internal info is written (also disables safety checks described in |shada-error-handling|). If 'shada' is empty, marks for up to 100 files will be written. - When you get error "E138: All .tmp.X files exist, + When you get error "E929: All .tmp.X files exist, cannot write ShaDa file!" check that no old temp files were left behind (e.g. ~/.local/share/nvim/shada/main.shada.tmp*). |