|
 |
d0ca2e3 |
To: vim_dev@googlegroups.com
|
|
|
d0ca2e3 |
Subject: Patch 7.4.131
|
|
|
d0ca2e3 |
Fcc: outbox
|
|
|
d0ca2e3 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
d0ca2e3 |
Mime-Version: 1.0
|
|
|
d0ca2e3 |
Content-Type: text/plain; charset=UTF-8
|
|
|
d0ca2e3 |
Content-Transfer-Encoding: 8bit
|
|
|
d0ca2e3 |
------------
|
|
|
d0ca2e3 |
|
|
|
d0ca2e3 |
Patch 7.4.131
|
|
|
d0ca2e3 |
Problem: Syncbind causes E315 errors in some situations. (Liang Li)
|
|
|
d0ca2e3 |
Solution: Set and restore curbuf in ex_syncbind(). (Christian Brabandt)
|
|
|
d0ca2e3 |
Files: src/ex_docmd.c, src/testdir/test37.ok
|
|
|
d0ca2e3 |
|
|
|
d0ca2e3 |
|
|
|
d0ca2e3 |
*** ../vim-7.4.130/src/ex_docmd.c 2013-12-11 17:44:33.000000000 +0100
|
|
|
d0ca2e3 |
--- src/ex_docmd.c 2013-12-14 12:55:05.000000000 +0100
|
|
|
d0ca2e3 |
***************
|
|
|
d0ca2e3 |
*** 8054,8059 ****
|
|
|
d0ca2e3 |
--- 8054,8061 ----
|
|
|
d0ca2e3 |
{
|
|
|
d0ca2e3 |
#ifdef FEAT_SCROLLBIND
|
|
|
d0ca2e3 |
win_T *wp;
|
|
|
d0ca2e3 |
+ win_T *save_curwin = curwin;
|
|
|
d0ca2e3 |
+ buf_T *save_curbuf = curbuf;
|
|
|
d0ca2e3 |
long topline;
|
|
|
d0ca2e3 |
long y;
|
|
|
d0ca2e3 |
linenr_T old_linenr = curwin->w_cursor.lnum;
|
|
|
d0ca2e3 |
***************
|
|
|
d0ca2e3 |
*** 8085,8097 ****
|
|
|
d0ca2e3 |
|
|
|
d0ca2e3 |
|
|
|
d0ca2e3 |
/*
|
|
|
d0ca2e3 |
! * set all scrollbind windows to the same topline
|
|
|
d0ca2e3 |
*/
|
|
|
d0ca2e3 |
- wp = curwin;
|
|
|
d0ca2e3 |
for (curwin = firstwin; curwin; curwin = curwin->w_next)
|
|
|
d0ca2e3 |
{
|
|
|
d0ca2e3 |
if (curwin->w_p_scb)
|
|
|
d0ca2e3 |
{
|
|
|
d0ca2e3 |
y = topline - curwin->w_topline;
|
|
|
d0ca2e3 |
if (y > 0)
|
|
|
d0ca2e3 |
scrollup(y, TRUE);
|
|
|
d0ca2e3 |
--- 8087,8099 ----
|
|
|
d0ca2e3 |
|
|
|
d0ca2e3 |
|
|
|
d0ca2e3 |
/*
|
|
|
d0ca2e3 |
! * Set all scrollbind windows to the same topline.
|
|
|
d0ca2e3 |
*/
|
|
|
d0ca2e3 |
for (curwin = firstwin; curwin; curwin = curwin->w_next)
|
|
|
d0ca2e3 |
{
|
|
|
d0ca2e3 |
if (curwin->w_p_scb)
|
|
|
d0ca2e3 |
{
|
|
|
d0ca2e3 |
+ curbuf = curwin->w_buffer;
|
|
|
d0ca2e3 |
y = topline - curwin->w_topline;
|
|
|
d0ca2e3 |
if (y > 0)
|
|
|
d0ca2e3 |
scrollup(y, TRUE);
|
|
|
d0ca2e3 |
***************
|
|
|
d0ca2e3 |
*** 8105,8111 ****
|
|
|
d0ca2e3 |
#endif
|
|
|
d0ca2e3 |
}
|
|
|
d0ca2e3 |
}
|
|
|
d0ca2e3 |
! curwin = wp;
|
|
|
d0ca2e3 |
if (curwin->w_p_scb)
|
|
|
d0ca2e3 |
{
|
|
|
d0ca2e3 |
did_syncbind = TRUE;
|
|
|
d0ca2e3 |
--- 8107,8114 ----
|
|
|
d0ca2e3 |
#endif
|
|
|
d0ca2e3 |
}
|
|
|
d0ca2e3 |
}
|
|
|
d0ca2e3 |
! curwin = save_curwin;
|
|
|
d0ca2e3 |
! curbuf = save_curbuf;
|
|
|
d0ca2e3 |
if (curwin->w_p_scb)
|
|
|
d0ca2e3 |
{
|
|
|
d0ca2e3 |
did_syncbind = TRUE;
|
|
|
d0ca2e3 |
*** ../vim-7.4.130/src/testdir/test37.ok 2010-05-15 13:04:10.000000000 +0200
|
|
|
d0ca2e3 |
--- src/testdir/test37.ok 2013-12-14 12:54:57.000000000 +0100
|
|
|
d0ca2e3 |
***************
|
|
|
d0ca2e3 |
*** 27,33 ****
|
|
|
d0ca2e3 |
|
|
|
d0ca2e3 |
. line 16 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 16
|
|
|
d0ca2e3 |
:set scrollbind
|
|
|
d0ca2e3 |
- zt:
|
|
|
d0ca2e3 |
- . line 15 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 15
|
|
|
d0ca2e3 |
:set scrollbind
|
|
|
d0ca2e3 |
! . line 11 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 11
|
|
|
d0ca2e3 |
--- 27,33 ----
|
|
|
d0ca2e3 |
|
|
|
d0ca2e3 |
. line 16 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 16
|
|
|
d0ca2e3 |
:set scrollbind
|
|
|
d0ca2e3 |
:set scrollbind
|
|
|
d0ca2e3 |
! . line 16 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 16
|
|
|
d0ca2e3 |
! ?j:
|
|
|
d0ca2e3 |
! . line 12 ZYXWVUTSRQPONMLKJIHGREDCBA9876543210 12
|
|
|
d0ca2e3 |
*** ../vim-7.4.130/src/version.c 2013-12-14 12:48:55.000000000 +0100
|
|
|
d0ca2e3 |
--- src/version.c 2013-12-14 13:03:51.000000000 +0100
|
|
|
d0ca2e3 |
***************
|
|
|
d0ca2e3 |
*** 740,741 ****
|
|
|
d0ca2e3 |
--- 740,743 ----
|
|
|
d0ca2e3 |
{ /* Add new patch number below this line */
|
|
|
d0ca2e3 |
+ /**/
|
|
|
d0ca2e3 |
+ 131,
|
|
|
d0ca2e3 |
/**/
|
|
|
d0ca2e3 |
|
|
|
d0ca2e3 |
--
|
|
|
d0ca2e3 |
hundred-and-one symptoms of being an internet addict:
|
|
|
d0ca2e3 |
57. You begin to wonder how on earth your service provider is allowed to call
|
|
|
d0ca2e3 |
200 hours per month "unlimited."
|
|
|
d0ca2e3 |
|
|
|
d0ca2e3 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
d0ca2e3 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
d0ca2e3 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
d0ca2e3 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|