diff options
| author | Josh Rahm <joshuarahm@gmail.com> | 2023-11-30 10:50:16 -0700 |
|---|---|---|
| committer | Josh Rahm <joshuarahm@gmail.com> | 2023-11-30 10:50:16 -0700 |
| commit | 8a98d50685575d20fcd6ad0dc7031d489d5e5361 (patch) | |
| tree | 9a2b95594af2c6fc1128c7cbfb73b67c1a8749cc /src/nvim/eval.c | |
| parent | 49fd5b067fed9744ee7e84f7db9209417023b5db (diff) | |
| parent | 23fd9a2b29cedef01ad6597854bc42ffb1bab86a (diff) | |
| download | rneovim-8a98d50685575d20fcd6ad0dc7031d489d5e5361.tar.gz rneovim-8a98d50685575d20fcd6ad0dc7031d489d5e5361.tar.bz2 rneovim-8a98d50685575d20fcd6ad0dc7031d489d5e5361.zip | |
Merge branch 'userreg' into 20231130_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 6786316b8e..b11f2f2922 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -3165,12 +3165,10 @@ static int eval7(char **arg, typval_T *rettv, evalarg_T *const evalarg, bool wan // 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; @@ -4483,7 +4481,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; @@ -4492,7 +4490,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) |