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