vim/patches/vim-7.3.110.patch0

   1 To: vim_dev@googlegroups.com
   2 Subject: Patch 7.3.110
   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.110
  11 Problem:    The "nbsp" item in 'listchars' isn't used for ":list".
  12 Solution:   Make it work. (Christian Brabandt)
  13 Files:      src/message.c
  14
  15
  16 *** ../vim-7.3.109/src/message.c        2011-01-17 20:08:03.000000000 +0100
  17 --- src/message.c       2011-02-01 17:06:21.000000000 +0100
  18 ***************
  19 *** 1637,1644 ****
  20         else if (has_mbyte && (l = (*mb_ptr2len)(s)) > 1)
  21         {
  22             col += (*mb_ptr2cells)(s);
  23 !           mch_memmove(buf, s, (size_t)l);
  24 !           buf[l] = NUL;
  25             msg_puts(buf);
  26             s += l;
  27             continue;
  28 --- 1637,1652 ----
  29         else if (has_mbyte && (l = (*mb_ptr2len)(s)) > 1)
  30         {
  31             col += (*mb_ptr2cells)(s);
  32 !           if (lcs_nbsp != NUL && list && mb_ptr2char(s) == 160)
  33 !           {
  34 !               mb_char2bytes(lcs_nbsp, buf);
  35 !               buf[(*mb_ptr2len)(buf)] = NUL;
  36 !           }
  37 !           else
  38 !           {
  39 !               mch_memmove(buf, s, (size_t)l);
  40 !               buf[l] = NUL;
  41 !           }
  42             msg_puts(buf);
  43             s += l;
  44             continue;
  45 ***************
  46 *** 1664,1669 ****
  47 --- 1672,1682 ----
  48                     attr = hl_attr(HLF_8);
  49                 }
  50             }
  51 +           else if (c == 160 && list && lcs_nbsp != NUL)
  52 +           {
  53 +               c = lcs_nbsp;
  54 +               attr = hl_attr(HLF_8);
  55 +           }
  56             else if (c == NUL && list && lcs_eol != NUL)
  57             {
  58                 p_extra = (char_u *)"";
  59 *** ../vim-7.3.109/src/version.c        2011-02-01 13:59:44.000000000 +0100
  60 --- src/version.c       2011-02-01 17:08:31.000000000 +0100
  61 ***************
  62 *** 716,717 ****
  63 --- 716,719 ----
  64   {   /* Add new patch number below this line */
  65 + /**/
  66 +     110,
  67   /**/
  68
  69 --
  70 hundred-and-one symptoms of being an internet addict:
  71 176. You lie, even to user-friends, about how long you were online yesterday.
  72
  73  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  74 ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  75 \\\  an exciting new programming language -- http://www.Zimbu.org        ///
  76  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///