073263
To: vim_dev@googlegroups.com
073263
Subject: Patch 7.4.349
073263
Fcc: outbox
073263
From: Bram Moolenaar <Bram@moolenaar.net>
073263
Mime-Version: 1.0
073263
Content-Type: text/plain; charset=UTF-8
073263
Content-Transfer-Encoding: 8bit
073263
------------
073263
073263
Patch 7.4.349
073263
Problem:    When there are matches to highlight the whole window is redrawn,
073263
	    which is slow.
073263
Solution:   Only redraw everything when lines were inserted or deleted.
073263
	    Reset b_mod_xlines when needed.  (Alexey Radkov)
073263
Files:	    src/screen.c, src/window.c
073263
073263
073263
*** ../vim-7.4.348/src/screen.c	2014-06-25 18:15:18.446838249 +0200
073263
--- src/screen.c	2014-06-28 15:35:18.868836570 +0200
073263
***************
073263
*** 1769,1776 ****
073263
  					syntax_check_changed(lnum)))
073263
  #endif
073263
  #ifdef FEAT_SEARCH_EXTRA
073263
! 				/* match in fixed position might need redraw */
073263
! 				||  wp->w_match_head != NULL
073263
  #endif
073263
  				)))))
073263
  	{
073263
--- 1769,1778 ----
073263
  					syntax_check_changed(lnum)))
073263
  #endif
073263
  #ifdef FEAT_SEARCH_EXTRA
073263
! 				/* match in fixed position might need redraw
073263
! 				 * if lines were inserted or deleted */
073263
! 				|| (wp->w_match_head != NULL
073263
! 						    && buf->b_mod_xlines != 0)
073263
  #endif
073263
  				)))))
073263
  	{
073263
*** ../vim-7.4.348/src/window.c	2014-06-25 18:15:18.446838249 +0200
073263
--- src/window.c	2014-06-28 15:38:51.952839835 +0200
073263
***************
073263
*** 6904,6915 ****
073263
  	    }
073263
  	    else
073263
  	    {
073263
  		wp->w_buffer->b_mod_top = toplnum;
073263
  		wp->w_buffer->b_mod_bot = botlnum;
073263
  	    }
073263
  	    m->pos.toplnum = toplnum;
073263
  	    m->pos.botlnum = botlnum;
073263
- 	    wp->w_buffer->b_mod_set = TRUE;
073263
  	    rtype = VALID;
073263
  	}
073263
      }
073263
--- 6904,6916 ----
073263
  	    }
073263
  	    else
073263
  	    {
073263
+ 		wp->w_buffer->b_mod_set = TRUE;
073263
  		wp->w_buffer->b_mod_top = toplnum;
073263
  		wp->w_buffer->b_mod_bot = botlnum;
073263
+ 		wp->w_buffer->b_mod_xlines = 0;
073263
  	    }
073263
  	    m->pos.toplnum = toplnum;
073263
  	    m->pos.botlnum = botlnum;
073263
  	    rtype = VALID;
073263
  	}
073263
      }
073263
***************
073263
*** 6986,6995 ****
073263
  	}
073263
  	else
073263
  	{
073263
  	    wp->w_buffer->b_mod_top = cur->pos.toplnum;
073263
  	    wp->w_buffer->b_mod_bot = cur->pos.botlnum;
073263
  	}
073263
- 	wp->w_buffer->b_mod_set = TRUE;
073263
  	rtype = VALID;
073263
      }
073263
      vim_free(cur);
073263
--- 6987,6997 ----
073263
  	}
073263
  	else
073263
  	{
073263
+ 	    wp->w_buffer->b_mod_set = TRUE;
073263
  	    wp->w_buffer->b_mod_top = cur->pos.toplnum;
073263
  	    wp->w_buffer->b_mod_bot = cur->pos.botlnum;
073263
+ 	    wp->w_buffer->b_mod_xlines = 0;
073263
  	}
073263
  	rtype = VALID;
073263
      }
073263
      vim_free(cur);
073263
*** ../vim-7.4.348/src/version.c	2014-07-02 17:02:29.726212319 +0200
073263
--- src/version.c	2014-07-02 17:15:58.646224714 +0200
073263
***************
073263
*** 736,737 ****
073263
--- 736,739 ----
073263
  {   /* Add new patch number below this line */
073263
+ /**/
073263
+     349,
073263
  /**/
073263
073263
-- 
073263
Trees moving back and forth is what makes the wind blow.
073263
073263
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
073263
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
073263
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
073263
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///