diff options
| author | Josh Rahm <rahm@google.com> | 2022-10-11 19:10:36 +0000 |
|---|---|---|
| committer | Josh Rahm <rahm@google.com> | 2022-10-11 19:10:36 +0000 |
| commit | ad86b5db74922285699ab2a1dbb2ff20e6268a33 (patch) | |
| tree | 6fbfa163656252307d6069525896917eab956c74 /src/nvim/viml/parser/parser.h | |
| parent | 242f75745009b3a0a2108d98ce6c02b6e13aac3f (diff) | |
| parent | 760b399f6c0c6470daa0663752bd22886997f9e6 (diff) | |
| download | rneovim-ad86b5db74922285699ab2a1dbb2ff20e6268a33.tar.gz rneovim-ad86b5db74922285699ab2a1dbb2ff20e6268a33.tar.bz2 rneovim-ad86b5db74922285699ab2a1dbb2ff20e6268a33.zip | |
Merge remote-tracking branch 'upstream/master' into userreg
Diffstat (limited to 'src/nvim/viml/parser/parser.h')
| -rw-r--r-- | src/nvim/viml/parser/parser.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/nvim/viml/parser/parser.h b/src/nvim/viml/parser/parser.h index b8835127e7..404dc5a0d1 100644 --- a/src/nvim/viml/parser/parser.h +++ b/src/nvim/viml/parser/parser.h @@ -5,8 +5,8 @@ #include <stdbool.h> #include <stddef.h> +#include "klib/kvec.h" #include "nvim/func_attr.h" -#include "nvim/lib/kvec.h" #include "nvim/mbyte.h" #include "nvim/memory.h" @@ -142,9 +142,7 @@ static inline void viml_preader_get_line(ParserInputReader *const preader, .allocated = true, .size = pline.size, }; - cpline.data = (char *)string_convert(&preader->conv, - (char_u *)pline.data, - &cpline.size); + cpline.data = string_convert(&preader->conv, (char *)pline.data, &cpline.size); if (pline.allocated) { xfree((void *)pline.data); } |