8ecbfad
To: vim_dev@googlegroups.com
8ecbfad
Subject: Patch 7.3.110
8ecbfad
Fcc: outbox
8ecbfad
From: Bram Moolenaar <Bram@moolenaar.net>
8ecbfad
Mime-Version: 1.0
8ecbfad
Content-Type: text/plain; charset=UTF-8
8ecbfad
Content-Transfer-Encoding: 8bit
8ecbfad
------------
8ecbfad
8ecbfad
Patch 7.3.110
8ecbfad
Problem:    The "nbsp" item in 'listchars' isn't used for ":list".
8ecbfad
Solution:   Make it work. (Christian Brabandt)
8ecbfad
Files:	    src/message.c
8ecbfad
8ecbfad
8ecbfad
*** ../vim-7.3.109/src/message.c	2011-01-17 20:08:03.000000000 +0100
8ecbfad
--- src/message.c	2011-02-01 17:06:21.000000000 +0100
8ecbfad
***************
8ecbfad
*** 1637,1644 ****
8ecbfad
  	else if (has_mbyte && (l = (*mb_ptr2len)(s)) > 1)
8ecbfad
  	{
8ecbfad
  	    col += (*mb_ptr2cells)(s);
8ecbfad
! 	    mch_memmove(buf, s, (size_t)l);
8ecbfad
! 	    buf[l] = NUL;
8ecbfad
  	    msg_puts(buf);
8ecbfad
  	    s += l;
8ecbfad
  	    continue;
8ecbfad
--- 1637,1652 ----
8ecbfad
  	else if (has_mbyte && (l = (*mb_ptr2len)(s)) > 1)
8ecbfad
  	{
8ecbfad
  	    col += (*mb_ptr2cells)(s);
8ecbfad
! 	    if (lcs_nbsp != NUL && list && mb_ptr2char(s) == 160)
8ecbfad
! 	    {
8ecbfad
! 		mb_char2bytes(lcs_nbsp, buf);
8ecbfad
! 		buf[(*mb_ptr2len)(buf)] = NUL;
8ecbfad
! 	    }
8ecbfad
! 	    else
8ecbfad
! 	    {
8ecbfad
! 		mch_memmove(buf, s, (size_t)l);
8ecbfad
! 		buf[l] = NUL;
8ecbfad
! 	    }
8ecbfad
  	    msg_puts(buf);
8ecbfad
  	    s += l;
8ecbfad
  	    continue;
8ecbfad
***************
8ecbfad
*** 1664,1669 ****
8ecbfad
--- 1672,1682 ----
8ecbfad
  		    attr = hl_attr(HLF_8);
8ecbfad
  		}
8ecbfad
  	    }
8ecbfad
+ 	    else if (c == 160 && list && lcs_nbsp != NUL)
8ecbfad
+ 	    {
8ecbfad
+ 		c = lcs_nbsp;
8ecbfad
+ 		attr = hl_attr(HLF_8);
8ecbfad
+ 	    }
8ecbfad
  	    else if (c == NUL && list && lcs_eol != NUL)
8ecbfad
  	    {
8ecbfad
  		p_extra = (char_u *)"";
8ecbfad
*** ../vim-7.3.109/src/version.c	2011-02-01 13:59:44.000000000 +0100
8ecbfad
--- src/version.c	2011-02-01 17:08:31.000000000 +0100
8ecbfad
***************
8ecbfad
*** 716,717 ****
8ecbfad
--- 716,719 ----
8ecbfad
  {   /* Add new patch number below this line */
8ecbfad
+ /**/
8ecbfad
+     110,
8ecbfad
  /**/
8ecbfad
8ecbfad
-- 
8ecbfad
hundred-and-one symptoms of being an internet addict:
8ecbfad
176. You lie, even to user-friends, about how long you were online yesterday.
8ecbfad
8ecbfad
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
8ecbfad
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
8ecbfad
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
8ecbfad
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///