To: vim_dev@googlegroups.com Subject: Patch 8.2.3882 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.3882 (after 8.2.3879) Problem: More duplicated code in f_getreginfo(). Solution: Also use getreg_get_regname(). (closes #9398) Files: src/evalfunc.c *** ../vim-8.2.3881/src/evalfunc.c 2021-12-24 10:48:26.004293584 +0000 --- src/evalfunc.c 2021-12-24 12:00:45.954210178 +0000 *************** *** 4675,4682 **** } /* ! * Common between getreg() and getregtype(): get the register name from the ! * first argument. * Returns zero on error. */ static int --- 4675,4682 ---- } /* ! * Common between getreg(), getreginfo() and getregtype(): get the register ! * name from the first argument. * Returns zero on error. */ static int *************** *** 7821,7827 **** static void f_getreginfo(typval_T *argvars, typval_T *rettv) { - char_u *strregname; int regname; char_u buf[NUMBUFLEN + 2]; long reglen = 0; --- 7821,7826 ---- *************** *** 7831,7852 **** if (in_vim9script() && check_for_opt_string_arg(argvars, 0) == FAIL) return; ! if (argvars[0].v_type != VAR_UNKNOWN) ! { ! strregname = tv_get_string_chk(&argvars[0]); ! if (strregname == NULL) ! return; ! if (in_vim9script() && STRLEN(strregname) > 1) ! { ! semsg(_(e_register_name_must_be_one_char_str), strregname); ! return; ! } ! } ! else ! strregname = get_vim_var_str(VV_REG); ! regname = (strregname == NULL ? '"' : *strregname); ! if (regname == 0 || regname == '@') regname = '"'; if (rettv_dict_alloc(rettv) == FAIL) --- 7830,7840 ---- if (in_vim9script() && check_for_opt_string_arg(argvars, 0) == FAIL) return; ! regname = getreg_get_regname(argvars); ! if (regname == 0) ! return; ! if (regname == '@') regname = '"'; if (rettv_dict_alloc(rettv) == FAIL) *** ../vim-8.2.3881/src/version.c 2021-12-24 11:57:03.182508536 +0000 --- src/version.c 2021-12-24 12:02:20.498083197 +0000 *************** *** 751,752 **** --- 751,754 ---- { /* Add new patch number below this line */ + /**/ + 3882, /**/ -- From "know your smileys": :-E Has major dental problems /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///