diff options
| author | ZyX <kp-pav@yandex.ru> | 2017-01-29 22:11:31 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-03-27 00:13:16 +0300 |
| commit | ebad04622056b0cb88e2b25211746b57fb4ef3c2 (patch) | |
| tree | 486437f92eb7c5d9b7ead5f6fa0324598c3b47e1 | |
| parent | 279e3410cf503a89d58d63b12032205c877707bc (diff) | |
| download | rneovim-ebad04622056b0cb88e2b25211746b57fb4ef3c2.tar.gz rneovim-ebad04622056b0cb88e2b25211746b57fb4ef3c2.tar.bz2 rneovim-ebad04622056b0cb88e2b25211746b57fb4ef3c2.zip | |
doc: Update vim_diff data regarding ShaDa
| -rw-r--r-- | runtime/doc/vim_diff.txt | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt index 6d4bd984a9..31bf098ba5 100644 --- a/runtime/doc/vim_diff.txt +++ b/runtime/doc/vim_diff.txt @@ -219,22 +219,15 @@ Additional differences: - |shada-c| has no effect. - |shada-s| now limits size of every item and not just registers. -- When reading ShaDa files items are merged according to the timestamp. - |shada-merging| - 'viminfo' option got renamed to 'shada'. Old option is kept as an alias for compatibility reasons. - |:wviminfo| was renamed to |:wshada|, |:rviminfo| to |:rshada|. Old commands are still kept. -- When writing (|:wshada| without bang or at exit) it merges much more data, - and does this according to the timestamp. Vim merges only marks. - |shada-merging| - ShaDa file format was designed with forward and backward compatibility in mind. |shada-compatibility| - Some errors make ShaDa code keep temporary file in-place for user to decide what to do with it. Vim deletes temporary file in these cases. |shada-error-handling| -- Vim keeps no timestamps at all, neither in viminfo file nor in the instance - itself. - ShaDa file keeps search direction (|v:searchforward|), viminfo does not. |printf()| returns something meaningful when used with `%p` argument: in Vim |