patch 7.4.1917v7.4.1917

Problem:    History lines read from viminfo in different encoding than when
            writing are not converted.
Solution:   Convert the history lines.

1 files changed, 22 insertions, 0 deletions

diff --git a/src/testdir/test_viminfo.vim b/src/testdir/test_viminfo.vim
index 279b1c3d1..1fefba1b6 100644
--- 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