To: vim-dev@vim.org Subject: Patch 6.1a.019 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.1a.019 Problem: When using a composing character on top of an ASCII character, the "l" command clears the composing character. Only when 'ruler' and 'showcmd' are off. (Raphael Finkel) Solution: Don't move the cursor by displaying characters when there are composing characters. Files: src/screen.c *** ../vim61a.018/src/screen.c Fri Feb 22 13:09:30 2002 --- src/screen.c Fri Mar 1 21:13:37 2002 *************** *** 6494,6506 **** #ifdef FEAT_MBYTE if (enc_utf8) { ! /* Don't use an UTF-8 char for positioning, it's slow. */ ! i = col - wouldbe_col; ! p = ScreenLines + LineOffset[row] + wouldbe_col; ! while (i && MB_BYTE2LEN(*p++) == 1) ! --i; ! if (i != 0) ! cost = 999; } #endif } --- 6494,6507 ---- #ifdef FEAT_MBYTE if (enc_utf8) { ! /* Don't use an UTF-8 char for positioning, it's slow. And ! * check for composing characters. */ ! for (i = wouldbe_col; i < col; ++i) ! if (ScreenLinesUC[LineOffset[row] + i] != 0) ! { ! cost = 999; ! break; ! } } #endif } *** ../vim61a.018/src/version.c Thu Feb 28 22:23:05 2002 --- src/version.c Fri Mar 1 21:16:37 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 19, /**/ -- From "know your smileys": :'-D Laughing so much that they're crying /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ /// Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim \\\ \\\ Project leader for A-A-P -- http://www.a-a-p.org /// \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org ///