diff options
| author | Josh Rahm <joshuarahm@gmail.com> | 2023-01-25 18:46:52 +0000 |
|---|---|---|
| committer | Josh Rahm <joshuarahm@gmail.com> | 2023-01-25 18:46:52 +0000 |
| commit | d6ccb60a1c75f49255940009abd3bb740bb461af (patch) | |
| tree | 88f3dfe9c58e0475bbc69eb085565919a9e4ea8e /src/nvim/eval.c | |
| parent | 9243becbedbb6a1592208051f8fa2b090dcc5e7d (diff) | |
| parent | 142d9041391780ac15b89886a54015fdc5c73995 (diff) | |
| download | rneovim-d6ccb60a1c75f49255940009abd3bb740bb461af.tar.gz rneovim-d6ccb60a1c75f49255940009abd3bb740bb461af.tar.bz2 rneovim-d6ccb60a1c75f49255940009abd3bb740bb461af.zip | |
Merge branch 'userreg' into 20230125_mix
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 4392ea306f..ffab9a02b5 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -2976,12 +2976,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**) 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; @@ -4175,7 +4173,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; @@ -4184,7 +4182,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) |