Mercurial > vim
changeset 9268:a00e32b5bb39 v7.4.1917
commit https://github.com/vim/vim/commit/012270936c3c7df3bba45ad2b48938c23a2fd43a
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jun 11 14:47:40 2016 +0200
patch 7.4.1917
Problem: History lines read from viminfo in different encoding than when
writing are not converted.
Solution: Convert the history lines.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 11 Jun 2016 15:00:06 +0200 |
parents | e4eff2323d2e |
children | 6ff13c33ae11 |
files | src/ex_cmds.c src/testdir/test_viminfo.vim src/version.c |
diffstat | 3 files changed, 52 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -2543,6 +2543,10 @@ barline_parse(vir_T *virp, char_u *text, int count = 0; int i; int allocated = FALSE; +#ifdef FEAT_MBYTE + char_u *sconv; + int converted; +#endif while (*p == ',') { @@ -2560,7 +2564,8 @@ barline_parse(vir_T *virp, char_u *text, if (!allocated) { for (i = 0; i < count; ++i) - if (values[i].bv_type == BVAL_STRING) + if (values[i].bv_type == BVAL_STRING + && !values[i].bv_allocated) { values[i].bv_string = vim_strnsave( values[i].bv_string, values[i].bv_len); @@ -2654,12 +2659,33 @@ barline_parse(vir_T *virp, char_u *text, } s[len] = NUL; +#ifdef FEAT_MBYTE + converted = FALSE; + if (virp->vir_conv.vc_type != CONV_NONE && *s != NUL) + { + sconv = string_convert(&virp->vir_conv, s, NULL); + if (sconv != NULL) + { + if (s == buf) + vim_free(s); + s = sconv; + buf = s; + converted = TRUE; + } + } +#endif + /* Need to copy in allocated memory if the string wasn't allocated + * above and we did allocate before, thus vir_line may change. */ if (s != buf && allocated) s = vim_strsave(s); values[count].bv_string = s; values[count].bv_type = BVAL_STRING; values[count].bv_len = len; - values[count].bv_allocated = allocated; + values[count].bv_allocated = allocated +#ifdef FEAT_MBYTE + || converted +#endif + ; ++count; if (nextp != NULL) {
--- a/src/testdir/test_viminfo.vim +++ b/src/testdir/test_viminfo.vim @@ -179,3 +179,25 @@ func Test_cmdline_history_order() call delete('Xviminfo') endfunc + +func Test_viminfo_encoding() + if !has('multi_byte') + return + endif + set enc=latin1 + call histdel(':') + call histadd(':', "echo '\xe9'") + wviminfo Xviminfo + + set fencs=utf-8,latin1 + set enc=utf-8 + sp Xviminfo + call assert_equal('latin1', &fenc) + close + + call histdel(':') + rviminfo Xviminfo + call assert_equal("echo 'é'", histget(':', -1)) + + call delete('Xviminfo') +endfunc