diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2015-10-16 01:54:07 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-10-16 01:54:07 -0400 |
| commit | 3a970e57dfd48f090f8ccc21567b7974e13d4c68 (patch) | |
| tree | 5aeaf1cd7a85c17b29276eee88e9881f56ea134c /src/nvim/fileio.c | |
| parent | a3f048ee06dea15490d7b874d295c3fc850cdc51 (diff) | |
| parent | db6cba7d5759e02379005702c7a9d760137f4389 (diff) | |
| download | rneovim-3a970e57dfd48f090f8ccc21567b7974e13d4c68.tar.gz rneovim-3a970e57dfd48f090f8ccc21567b7974e13d4c68.tar.bz2 rneovim-3a970e57dfd48f090f8ccc21567b7974e13d4c68.zip | |
Merge pull request #2506 from ZyX-I/shada
Replace viminfo with ShaDa files
Diffstat (limited to 'src/nvim/fileio.c')
| -rw-r--r-- | src/nvim/fileio.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index 302f6b30fb..a7472b40e2 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -57,6 +57,7 @@ #include "nvim/types.h" #include "nvim/undo.h" #include "nvim/window.h" +#include "nvim/shada.h" #include "nvim/os/os.h" #include "nvim/os/time.h" #include "nvim/os/input.h" @@ -2166,16 +2167,17 @@ readfile_charconvert ( /* - * Read marks for the current buffer from the viminfo file, when we support + * Read marks for the current buffer from the ShaDa file, when we support * buffer marks and the buffer has a name. */ static void check_marks_read(void) { - if (!curbuf->b_marks_read && get_viminfo_parameter('\'') > 0 - && curbuf->b_ffname != NULL) - read_viminfo(NULL, VIF_WANT_MARKS); + if (!curbuf->b_marks_read && get_shada_parameter('\'') > 0 + && curbuf->b_ffname != NULL) { + shada_read_marks(); + } - /* Always set b_marks_read; needed when 'viminfo' is changed to include + /* Always set b_marks_read; needed when 'shada' is changed to include * the ' parameter after opening a buffer. */ curbuf->b_marks_read = true; } |