To: vim_dev@googlegroups.com Subject: Patch 7.4.2084 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.2084 Problem: New digraph test makes testing hang. Solution: Don't set "nocp". Files: src/testdir/test_digraph.vim *** ../vim-7.4.2083/src/testdir/test_digraph.vim 2016-07-20 22:00:55.859928795 +0200 --- src/testdir/test_digraph.vim 2016-07-20 22:20:51.247343572 +0200 *************** *** 4,9 **** --- 4,11 ---- finish endif + scriptencoding utf-8 + func! Put_Dig(chars) exe "norm! o\".a:chars endfu *************** *** 13,20 **** endfu func! Test_digraphs() ! let _enc=&enc ! set nocp enc=utf8 new call Put_Dig("00") call assert_equal("∞", getline('.')) --- 15,22 ---- endfu func! Test_digraphs() ! let _enc = &enc ! set enc=utf8 new call Put_Dig("00") call assert_equal("∞", getline('.')) *************** *** 214,220 **** call Put_Dig("el") call assert_equal(['␀', 'ü', '∞', 'l'], getline(line('.')-3,line('.'))) " reset encoding option ! let &enc=_enc bw! endfunc --- 216,222 ---- call Put_Dig("el") call assert_equal(['␀', 'ü', '∞', 'l'], getline(line('.')-3,line('.'))) " reset encoding option ! let &enc = _enc bw! endfunc *************** *** 222,228 **** let _enc=&enc " reset whichwrap option, so that testing A works, " without moving up a line ! set nocp enc=utf8 digraph ww= new call Put_Dig_BS("0","0") call assert_equal("∞", getline('.')) --- 224,230 ---- let _enc=&enc " reset whichwrap option, so that testing A works, " without moving up a line ! set enc=utf8 digraph ww= new call Put_Dig_BS("0","0") call assert_equal("∞", getline('.')) *************** *** 422,428 **** 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 --- 424,430 ---- 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 *** ../vim-7.4.2083/src/version.c 2016-07-20 22:11:01.469543960 +0200 --- src/version.c 2016-07-20 22:20:11.863757125 +0200 *************** *** 760,761 **** --- 760,763 ---- { /* Add new patch number below this line */ + /**/ + 2084, /**/ -- ARTHUR: You fight with the strength of many men, Sir knight. I am Arthur, King of the Britons. [pause] I seek the finest and the bravest knights in the land to join me in my Court of Camelot. [pause] You have proved yourself worthy; will you join me? [pause] You make me sad. So be it. Come, Patsy. BLACK KNIGHT: None shall pass. The Quest for the Holy Grail (Monty Python) /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///