|
 |
dd7ab95 |
To: vim_dev@googlegroups.com
|
|
|
dd7ab95 |
Subject: Patch 7.3.830
|
|
|
dd7ab95 |
Fcc: outbox
|
|
|
dd7ab95 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
dd7ab95 |
Mime-Version: 1.0
|
|
|
dd7ab95 |
Content-Type: text/plain; charset=UTF-8
|
|
|
dd7ab95 |
Content-Transfer-Encoding: 8bit
|
|
|
dd7ab95 |
------------
|
|
|
dd7ab95 |
|
|
|
dd7ab95 |
Patch 7.3.830
|
|
|
dd7ab95 |
Problem: :mksession confuses bytes, columns and characters when positioning
|
|
|
dd7ab95 |
the cursor.
|
|
|
dd7ab95 |
Solution: Use w_virtcol with "|" instead of w_cursor.col with "l".
|
|
|
dd7ab95 |
Files: src/ex_docmd.c
|
|
|
dd7ab95 |
|
|
|
dd7ab95 |
|
|
|
dd7ab95 |
*** ../vim-7.3.829/src/ex_docmd.c 2013-02-14 22:11:31.000000000 +0100
|
|
|
dd7ab95 |
--- src/ex_docmd.c 2013-02-20 19:13:21.000000000 +0100
|
|
|
dd7ab95 |
***************
|
|
|
dd7ab95 |
*** 10829,10852 ****
|
|
|
dd7ab95 |
{
|
|
|
dd7ab95 |
if (fprintf(fd,
|
|
|
dd7ab95 |
"let s:c = %ld - ((%ld * winwidth(0) + %ld) / %ld)",
|
|
|
dd7ab95 |
! (long)wp->w_cursor.col,
|
|
|
dd7ab95 |
! (long)(wp->w_cursor.col - wp->w_leftcol),
|
|
|
dd7ab95 |
(long)wp->w_width / 2, (long)wp->w_width) < 0
|
|
|
dd7ab95 |
|| put_eol(fd) == FAIL
|
|
|
dd7ab95 |
|| put_line(fd, "if s:c > 0") == FAIL
|
|
|
dd7ab95 |
|| fprintf(fd,
|
|
|
dd7ab95 |
! " exe 'normal! 0' . s:c . 'lzs' . (%ld - s:c) . 'l'",
|
|
|
dd7ab95 |
! (long)wp->w_cursor.col) < 0
|
|
|
dd7ab95 |
|| put_eol(fd) == FAIL
|
|
|
dd7ab95 |
|| put_line(fd, "else") == FAIL
|
|
|
dd7ab95 |
! || fprintf(fd, " normal! 0%dl", wp->w_cursor.col) < 0
|
|
|
dd7ab95 |
|| put_eol(fd) == FAIL
|
|
|
dd7ab95 |
|| put_line(fd, "endif") == FAIL)
|
|
|
dd7ab95 |
return FAIL;
|
|
|
dd7ab95 |
}
|
|
|
dd7ab95 |
else
|
|
|
dd7ab95 |
{
|
|
|
dd7ab95 |
! if (fprintf(fd, "normal! 0%dl", wp->w_cursor.col) < 0
|
|
|
dd7ab95 |
|| put_eol(fd) == FAIL)
|
|
|
dd7ab95 |
return FAIL;
|
|
|
dd7ab95 |
}
|
|
|
dd7ab95 |
--- 10829,10852 ----
|
|
|
dd7ab95 |
{
|
|
|
dd7ab95 |
if (fprintf(fd,
|
|
|
dd7ab95 |
"let s:c = %ld - ((%ld * winwidth(0) + %ld) / %ld)",
|
|
|
dd7ab95 |
! (long)wp->w_virtcol + 1,
|
|
|
dd7ab95 |
! (long)(wp->w_virtcol - wp->w_leftcol),
|
|
|
dd7ab95 |
(long)wp->w_width / 2, (long)wp->w_width) < 0
|
|
|
dd7ab95 |
|| put_eol(fd) == FAIL
|
|
|
dd7ab95 |
|| put_line(fd, "if s:c > 0") == FAIL
|
|
|
dd7ab95 |
|| fprintf(fd,
|
|
|
dd7ab95 |
! " exe 'normal! ' . s:c . '|zs' . %ld . '|'",
|
|
|
dd7ab95 |
! (long)wp->w_virtcol + 1) < 0
|
|
|
dd7ab95 |
|| put_eol(fd) == FAIL
|
|
|
dd7ab95 |
|| put_line(fd, "else") == FAIL
|
|
|
dd7ab95 |
! || fprintf(fd, " normal! %d|", wp->w_virtcol + 1) < 0
|
|
|
dd7ab95 |
|| put_eol(fd) == FAIL
|
|
|
dd7ab95 |
|| put_line(fd, "endif") == FAIL)
|
|
|
dd7ab95 |
return FAIL;
|
|
|
dd7ab95 |
}
|
|
|
dd7ab95 |
else
|
|
|
dd7ab95 |
{
|
|
|
dd7ab95 |
! if (fprintf(fd, "normal! 0%d|", wp->w_virtcol + 1) < 0
|
|
|
dd7ab95 |
|| put_eol(fd) == FAIL)
|
|
|
dd7ab95 |
return FAIL;
|
|
|
dd7ab95 |
}
|
|
|
dd7ab95 |
*** ../vim-7.3.829/src/version.c 2013-02-20 18:39:07.000000000 +0100
|
|
|
dd7ab95 |
--- src/version.c 2013-02-20 19:14:18.000000000 +0100
|
|
|
dd7ab95 |
***************
|
|
|
dd7ab95 |
*** 730,731 ****
|
|
|
dd7ab95 |
--- 730,733 ----
|
|
|
dd7ab95 |
{ /* Add new patch number below this line */
|
|
|
dd7ab95 |
+ /**/
|
|
|
dd7ab95 |
+ 830,
|
|
|
dd7ab95 |
/**/
|
|
|
dd7ab95 |
|
|
|
dd7ab95 |
--
|
|
|
dd7ab95 |
Westheimer's Discovery:
|
|
|
dd7ab95 |
A couple of months in the laboratory can
|
|
|
dd7ab95 |
frequently save a couple of hours in the library.
|
|
|
dd7ab95 |
|
|
|
dd7ab95 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
dd7ab95 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
dd7ab95 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
dd7ab95 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|