To: vim_dev@googlegroups.com Subject: Patch 8.2.3325 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.3325 Problem: Digraph test fails when LC_ALL is set to "C". Solution: When restoring 'encoding' set it to "utf-8". (closes #8742) Files: src/testdir/test_digraph.vim *** ../vim-8.2.3324/src/testdir/test_digraph.vim 2021-07-26 21:54:00.055491571 +0200 --- src/testdir/test_digraph.vim 2021-08-10 21:37:00.170179239 +0200 *************** *** 557,562 **** --- 557,563 ---- func Test_digraph_get_function_encode() CheckFeature iconv + let testcases = { \'00': '∞', \'aa': 'あ', *************** *** 565,571 **** call digraph_set(key, ch) set encoding=japan call assert_equal(iconv(ch, 'utf-8', 'japan'), digraph_get(key)) ! set encoding& endfor endfunc --- 566,572 ---- call digraph_set(key, ch) set encoding=japan call assert_equal(iconv(ch, 'utf-8', 'japan'), digraph_get(key)) ! set encoding=utf-8 endfor endfunc *************** *** 592,595 **** --- 593,598 ---- call assert_equal(digraph_getlist()->len(), digraph_getlist(0)->len()) call assert_notequal((digraph_getlist()->len()), digraph_getlist(1)->len()) endfunc + + " vim: shiftwidth=2 sts=2 expandtab *** ../vim-8.2.3324/src/version.c 2021-08-10 19:52:57.474235537 +0200 --- src/version.c 2021-08-10 21:38:20.881967305 +0200 *************** *** 757,758 **** --- 757,760 ---- { /* Add new patch number below this line */ + /**/ + 3325, /**/ -- FATHER: You only killed the bride's father - that's all - LAUNCELOT: Oh dear, I didn't really mean to... FATHER: Didn't mean to? You put your sword right through his head! LAUNCELOT: Gosh - Is he all right? "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// 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 ///