7.3.553

   1 To: vim_dev@googlegroups.com
   2 Subject: Patch 7.3.553
   3 Fcc: outbox
   4 From: Bram Moolenaar <Bram@moolenaar.net>
   5 Mime-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8 ------------
   9
  10 Patch 7.3.553
  11 Problem:    With double-width characters and 'listchars' containing "precedes"
  12             the text is displayed one cell off.
  13 Solution:   Check for double-width character being overwritten by the
  14             "precedes" character. (Yasuhiro Matsumoto)
  15 Files:      src/screen.c
  16
  17
  18 *** ../vim-7.3.552/src/screen.c 2012-06-06 19:05:45.000000000 +0200
  19 --- src/screen.c        2012-06-13 17:55:10.000000000 +0200
  20 ***************
  21 *** 89,94 ****
  22 --- 89,97 ----
  23
  24   #include "vim.h"
  25
  26 + #define MB_FILLER_CHAR '<'  /* character used when a double-width character
  27 +                            * doesn't fit. */
  28 +
  29   /*
  30    * The attributes that are actually active for writing to the screen.
  31    */
  32 ***************
  33 *** 4016,4022 ****
  34                 if (n_skip > 0 && mb_l > 1 && n_extra == 0)
  35                 {
  36                     n_extra = 1;
  37 !                   c_extra = '<';
  38                     c = ' ';
  39                     if (area_attr == 0 && search_attr == 0)
  40                     {
  41 --- 4019,4025 ----
  42                 if (n_skip > 0 && mb_l > 1 && n_extra == 0)
  43                 {
  44                     n_extra = 1;
  45 !                   c_extra = MB_FILLER_CHAR;
  46                     c = ' ';
  47                     if (area_attr == 0 && search_attr == 0)
  48                     {
  49 ***************
  50 *** 4576,4581 ****
  51 --- 4579,4593 ----
  52             c = lcs_prec;
  53             lcs_prec_todo = NUL;
  54   #ifdef FEAT_MBYTE
  55 +           if (has_mbyte && (*mb_char2cells)(mb_c) > 1)
  56 +           {
  57 +               /* Double-width character being overwritten by the "precedes"
  58 +                * character, need to fill up half the character. */
  59 +               c_extra = MB_FILLER_CHAR;
  60 +               n_extra = 1;
  61 +               n_attr = 2;
  62 +               extra_attr = hl_attr(HLF_AT);
  63 +           }
  64             mb_c = c;
  65             if (enc_utf8 && (*mb_char2len)(c) > 1)
  66             {
  67 *** ../vim-7.3.552/src/version.c        2012-06-13 17:28:51.000000000 +0200
  68 --- src/version.c       2012-06-13 17:48:45.000000000 +0200
  69 ***************
  70 *** 716,717 ****
  71 --- 716,719 ----
  72   {   /* Add new patch number below this line */
  73 + /**/
  74 +     553,
  75   /**/
  76
  77 --
  78 hundred-and-one symptoms of being an internet addict:
  79 32. You don't know what sex three of your closest friends are, because they
  80     have neutral nicknames and you never bothered to ask.
  81
  82  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  83 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  84 \\\  an exciting new programming language -- http://www.Zimbu.org        ///
  85  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///