To: vim_dev@googlegroups.com Subject: Patch 7.4.1642 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.1642 Problem: Handling emoji characters as full width has problems with backwards compatibility. Solution: Only put characters in the 1f000 range in the emoji table. Files: runtime/tools/unicode.vim, src/mbyte.c *** ../vim-7.4.1641/runtime/tools/unicode.vim 2016-03-21 22:09:39.552789897 +0100 --- runtime/tools/unicode.vim 2016-03-24 18:23:13.672520525 +0100 *************** *** 283,288 **** --- 283,294 ---- call add(alltokens, token) endif + " Characters below 1F000 may be considered single width traditionally, + " making them double width causes problems. + if first < 0x1f000 + continue + endif + " exclude characters that are in the "ambiguous" or "doublewidth" table for ambi in s:ambitable if first >= ambi[0] && first <= ambi[1] *** ../vim-7.4.1641/src/mbyte.c 2016-03-21 22:15:25.489161889 +0100 --- src/mbyte.c 2016-03-24 18:20:25.318230103 +0100 *************** *** 1445,1508 **** * based on http://unicode.org/emoji/charts/emoji-list.html */ static struct interval emoji_width[] = { - {0x203c, 0x203c}, - {0x2049, 0x2049}, - {0x2139, 0x2139}, - {0x21a9, 0x21aa}, - {0x231a, 0x231b}, - {0x2328, 0x2328}, - {0x23cf, 0x23cf}, - {0x23e9, 0x23f3}, - {0x25aa, 0x25ab}, - {0x25fb, 0x25fe}, - {0x2600, 0x2604}, - {0x2611, 0x2611}, - {0x2618, 0x2618}, - {0x261d, 0x261d}, - {0x2620, 0x2620}, - {0x2622, 0x2623}, - {0x2626, 0x2626}, - {0x262a, 0x262a}, - {0x262e, 0x262f}, - {0x2638, 0x263a}, - {0x2648, 0x2653}, - {0x2666, 0x2666}, - {0x267b, 0x267b}, - {0x267f, 0x267f}, - {0x2692, 0x2694}, - {0x2696, 0x2697}, - {0x2699, 0x2699}, - {0x269b, 0x269c}, - {0x26a0, 0x26a1}, - {0x26aa, 0x26ab}, - {0x26b0, 0x26b1}, - {0x26bd, 0x26bd}, - {0x26ce, 0x26ce}, - {0x2702, 0x2702}, - {0x2705, 0x2705}, - {0x2708, 0x270d}, - {0x270f, 0x270f}, - {0x2712, 0x2712}, - {0x2714, 0x2714}, - {0x2716, 0x2716}, - {0x271d, 0x271d}, - {0x2721, 0x2721}, - {0x2728, 0x2728}, - {0x2733, 0x2734}, - {0x2744, 0x2744}, - {0x2747, 0x2747}, - {0x274c, 0x274c}, - {0x274e, 0x274e}, - {0x2753, 0x2755}, - {0x2763, 0x2764}, - {0x2795, 0x2797}, - {0x27a1, 0x27a1}, - {0x27b0, 0x27b0}, - {0x27bf, 0x27bf}, - {0x2934, 0x2935}, - {0x2b05, 0x2b07}, - {0x2b1b, 0x2b1c}, - {0x2b50, 0x2b50}, {0x1f004, 0x1f004}, {0x1f0cf, 0x1f0cf}, {0x1f1e6, 0x1f1ff}, --- 1445,1450 ---- *** ../vim-7.4.1641/src/version.c 2016-03-23 22:28:20.944072651 +0100 --- src/version.c 2016-03-24 18:21:14.817727419 +0100 *************** *** 750,751 **** --- 750,753 ---- { /* Add new patch number below this line */ + /**/ + 1642, /**/ -- hundred-and-one symptoms of being an internet addict: 109. You actually read -- and enjoy -- lists like this. /// 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 ///