Karsten Hopp f5824d
To: vim_dev@googlegroups.com
Karsten Hopp f5824d
Subject: Patch 7.3.106
Karsten Hopp f5824d
Fcc: outbox
Karsten Hopp f5824d
From: Bram Moolenaar <Bram@moolenaar.net>
Karsten Hopp f5824d
Mime-Version: 1.0
Karsten Hopp f5824d
Content-Type: text/plain; charset=UTF-8
Karsten Hopp f5824d
Content-Transfer-Encoding: 8bit
Karsten Hopp f5824d
------------
Karsten Hopp f5824d
Karsten Hopp f5824d
Patch 7.3.106
Karsten Hopp f5824d
Problem:    When 'cursorbind' is set another window may scroll unexpectedly
Karsten Hopp f5824d
            when 'scrollbind' is also set. (Xavier Wang)
Karsten Hopp f5824d
Solution:   Don't call update_topline() if 'scrollbind' is set.
Karsten Hopp f5824d
Files:      src/move.c
Karsten Hopp f5824d
Karsten Hopp f5824d
Karsten Hopp f5824d
*** ../vim-7.3.105/src/move.c	2010-08-15 21:57:29.000000000 +0200
Karsten Hopp f5824d
--- src/move.c	2011-01-22 20:58:50.000000000 +0100
Karsten Hopp f5824d
***************
Karsten Hopp f5824d
*** 2882,2890 ****
Karsten Hopp f5824d
  	    if (has_mbyte)
Karsten Hopp f5824d
  		mb_adjust_cursor();
Karsten Hopp f5824d
  # endif
Karsten Hopp f5824d
- 
Karsten Hopp f5824d
  	    redraw_later(VALID);
Karsten Hopp f5824d
! 	    update_topline();
Karsten Hopp f5824d
  # ifdef FEAT_WINDOWS
Karsten Hopp f5824d
  	    curwin->w_redr_status = TRUE;
Karsten Hopp f5824d
  # endif
Karsten Hopp f5824d
--- 2882,2892 ----
Karsten Hopp f5824d
  	    if (has_mbyte)
Karsten Hopp f5824d
  		mb_adjust_cursor();
Karsten Hopp f5824d
  # endif
Karsten Hopp f5824d
  	    redraw_later(VALID);
Karsten Hopp f5824d
! 
Karsten Hopp f5824d
! 	    /* Only scroll when 'scrollbind' hasn't done this. */
Karsten Hopp f5824d
! 	    if (!curwin->w_p_scb)
Karsten Hopp f5824d
! 		update_topline();
Karsten Hopp f5824d
  # ifdef FEAT_WINDOWS
Karsten Hopp f5824d
  	    curwin->w_redr_status = TRUE;
Karsten Hopp f5824d
  # endif
Karsten Hopp f5824d
*** ../vim-7.3.105/src/version.c	2011-01-22 01:13:33.000000000 +0100
Karsten Hopp f5824d
--- src/version.c	2011-01-22 21:03:21.000000000 +0100
Karsten Hopp f5824d
***************
Karsten Hopp f5824d
*** 716,717 ****
Karsten Hopp f5824d
--- 716,719 ----
Karsten Hopp f5824d
  {   /* Add new patch number below this line */
Karsten Hopp f5824d
+ /**/
Karsten Hopp f5824d
+     106,
Karsten Hopp f5824d
  /**/
Karsten Hopp f5824d
Karsten Hopp f5824d
-- 
Karsten Hopp f5824d
Never eat yellow snow.
Karsten Hopp f5824d
Karsten Hopp f5824d
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
Karsten Hopp f5824d
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
Karsten Hopp f5824d
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
Karsten Hopp f5824d
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///