diff options
| author | Josh Rahm <joshuarahm@gmail.com> | 2023-01-14 23:19:41 -0700 |
|---|---|---|
| committer | Josh Rahm <joshuarahm@gmail.com> | 2023-01-14 23:19:41 -0700 |
| commit | 3e0218e7a0c47e2ce0aad11b635944cdd9b75c65 (patch) | |
| tree | 9f3367296555c22f355bf5250b0d7d1924cec5f7 /src/nvim/eval.c | |
| parent | 7a6e249a32f79331bfb5e29bc0cabcf89a026081 (diff) | |
| parent | 396c48d54ef313ca02e2e97849e51721094400cd (diff) | |
| download | rneovim-3e0218e7a0c47e2ce0aad11b635944cdd9b75c65.tar.gz rneovim-3e0218e7a0c47e2ce0aad11b635944cdd9b75c65.tar.bz2 rneovim-3e0218e7a0c47e2ce0aad11b635944cdd9b75c65.zip | |
Merge branch 'userreg' into HEAD
Diffstat (limited to 'src/nvim/eval.c')
| -rw-r--r-- | src/nvim/eval.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index f9825496a5..af52e87728 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -3060,12 +3060,10 @@ static int eval7(char **arg, typval_T *rettv, int evaluate, int want_string) // Register contents: @r. case '@': (*arg)++; + int regname = mb_cptr2char_adv((const char_u**) arg); if (evaluate) { rettv->v_type = VAR_STRING; - rettv->vval.v_string = get_reg_contents(**arg, kGRegExprSrc); - } - if (**arg != NUL) { - (*arg)++; + rettv->vval.v_string = get_reg_contents(regname, kGRegExprSrc); } break; @@ -4173,7 +4171,7 @@ bool garbage_collect(bool testing) // registers (ShaDa additional data) { - const void *reg_iter = NULL; + iter_register_T reg_iter = ITER_REGISTER_NULL; do { yankreg_T reg; char name = NUL; @@ -4182,7 +4180,7 @@ bool garbage_collect(bool testing) if (name != NUL) { ABORTING(set_ref_dict)(reg.additional_data, copyID); } - } while (reg_iter != NULL); + } while (reg_iter != ITER_REGISTER_NULL); } // global marks (ShaDa additional data) |