Mercurial > vim

diff src/testdir/test_digraph.vim @ 9616:6144d9bfb037 v7.4.2085

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/dfd63e30d13fff5603416b6c7e247cebeb003eb0 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Jul 21 10:11:03 2016 +0200 patch 7.4.2085 Problem: Digraph tests fails on some systems. Solution: Run it separately and set 'encoding' early.
author Christian Brabandt <cb@256bit.org>
date Thu, 21 Jul 2016 10:15:05 +0200
parents d9d3ef70c859
children 81ba6e4eb72b
line wrap: on
line diff
--- a/src/testdir/test_digraph.vim
+++ b/src/testdir/test_digraph.vim
@@ -4,6 +4,7 @@ if !has("digraphs") || !has("multi_byte"
   finish
 endif
 
+set enc=utf-8
 scriptencoding utf-8
 
 func! Put_Dig(chars)
@@ -15,8 +16,6 @@ func! Put_Dig_BS(char1, char2)
 endfu
 
 func! Test_digraphs()
-  let _enc = &enc
-  set enc=utf8
   new
   call Put_Dig("00")
   call assert_equal("∞", getline('.'))
@@ -215,16 +214,13 @@ func! Test_digraphs()
   call Put_Dig("00")
   call Put_Dig("el")
   call assert_equal(['␀', 'ü', '∞', 'l'], getline(line('.')-3,line('.')))
-  " reset encoding option
-  let &enc = _enc
   bw!
 endfunc
 
 func! Test_digraphs_option()
-  let _enc=&enc
   " reset whichwrap option, so that testing <esc><bs>A works,
   " without moving up a line
-  set enc=utf8 digraph ww=
+  set digraph ww=
   new
   call Put_Dig_BS("0","0")
   call assert_equal("∞", getline('.'))
@@ -423,8 +419,6 @@ func! Test_digraphs_option()
   call Put_Dig_BS("0","0")
   call Put_Dig_BS("e","l")
   call assert_equal(['␀', 'ü', '∞', 'l'], getline(line('.')-3,line('.')))
-  " reset encoding option
-  let &enc = _enc
   set nodigraph ww&vim
   bw!
 endfunc