To: vim-dev@vim.org
Subject: Patch 6.1.107
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 6.1.107
Problem:    When 'list' is set the current line in the error window may be
	    displayed wrong. (Muraoka Taro)
Solution:   Don't continue the line after the $ has been displayed and the
	    rightmost column is reached.
Files:	    src/screen.c


*** ../vim61.106/src/screen.c	Tue Jun 18 20:08:28 2002
--- src/screen.c	Sun Jun  9 16:45:36 2002
***************
*** 3384,3390 ****
  		    mb_utf8 = FALSE;	/* don't draw as UTF-8 */
  #endif
  		}
! 		else if (c == NUL && wp->w_p_list && lcs_eol_one != NUL)
  		{
  #if defined(FEAT_DIFF) || defined(LINE_ATTR)
  		    /* For a diff line the highlighting continues after the
--- 3384,3390 ----
  		    mb_utf8 = FALSE;	/* don't draw as UTF-8 */
  #endif
  		}
! 		else if (c == NUL && wp->w_p_list && lcs_eol_one > 0)
  		{
  #if defined(FEAT_DIFF) || defined(LINE_ATTR)
  		    /* For a diff line the highlighting continues after the
***************
*** 3417,3423 ****
  			}
  		    }
  		    c = lcs_eol;
! 		    lcs_eol_one = NUL;
  		    --ptr;	    /* put it back at the NUL */
  		    if (area_attr == 0 && search_attr == 0)
  		    {
--- 3417,3423 ----
  			}
  		    }
  		    c = lcs_eol;
! 		    lcs_eol_one = -1;
  		    --ptr;	    /* put it back at the NUL */
  		    if (area_attr == 0 && search_attr == 0)
  		    {
***************
*** 3789,3800 ****
  	    ++row;
  	    ++screen_row;
  
! 	    /* When not wrapping and finished diff lines, break here. */
! 	    if (!wp->w_p_wrap
  #ifdef FEAT_DIFF
  		    && filler_todo <= 0
  #endif
! 		    )
  		break;
  
  	    /* When the window is too narrow draw all "@" lines. */
--- 3789,3801 ----
  	    ++row;
  	    ++screen_row;
  
! 	    /* When not wrapping and finished diff lines, or when displayed
! 	     * '$' and highlighting until last column, break here. */
! 	    if ((!wp->w_p_wrap
  #ifdef FEAT_DIFF
  		    && filler_todo <= 0
  #endif
! 		    ) || lcs_eol_one == -1)
  		break;
  
  	    /* When the window is too narrow draw all "@" lines. */
*** ../vim61.106/src/version.c	Sun Jun 23 14:39:52 2002
--- src/version.c	Sun Jun 23 14:41:43 2002
***************
*** 608,609 ****
--- 608,611 ----
  {   /* Add new patch number below this line */
+ /**/
+     107,
  /**/

-- 
   GALAHAD hurries to the door and pushes through it.  As he leaves the room
   we CUT TO the reverse to show that he is now in a room full of bathing
   and romping GIRLIES, all innocent, wide-eyed and beautiful.  They smile
   enchantingly at him as he tries to keep walking without being diverted by
   the lovely sights assaulting his eyeballs.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 ///  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  ///