|
 |
9a55382 |
To: vim-dev@vim.org
|
|
|
9a55382 |
Subject: Patch 7.0.042
|
|
|
9a55382 |
Fcc: outbox
|
|
|
9a55382 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
9a55382 |
Mime-Version: 1.0
|
|
|
9a55382 |
Content-Type: text/plain; charset=ISO-8859-1
|
|
|
9a55382 |
Content-Transfer-Encoding: 8bit
|
|
|
9a55382 |
------------
|
|
|
9a55382 |
|
|
|
9a55382 |
Patch 7.0.042
|
|
|
9a55382 |
Problem: When pasting a block of text in Insert mode Vim hangs or crashes.
|
|
|
9a55382 |
(Noam Halevy)
|
|
|
9a55382 |
Solution: Avoid that the cursor is positioned past the NUL of a line.
|
|
|
9a55382 |
Files: src/ops.c
|
|
|
9a55382 |
|
|
|
9a55382 |
|
|
|
9a55382 |
*** ../vim-7.0.041/src/ops.c Tue Jun 20 20:29:13 2006
|
|
|
9a55382 |
--- src/ops.c Sun Jul 23 22:36:39 2006
|
|
|
9a55382 |
***************
|
|
|
9a55382 |
*** 3493,3500 ****
|
|
|
9a55382 |
--- 3493,3507 ----
|
|
|
9a55382 |
# endif
|
|
|
9a55382 |
if (flags & PUT_CURSEND)
|
|
|
9a55382 |
{
|
|
|
9a55382 |
+ colnr_T len;
|
|
|
9a55382 |
+
|
|
|
9a55382 |
curwin->w_cursor = curbuf->b_op_end;
|
|
|
9a55382 |
curwin->w_cursor.col++;
|
|
|
9a55382 |
+
|
|
|
9a55382 |
+ /* in Insert mode we might be after the NUL, correct for that */
|
|
|
9a55382 |
+ len = (colnr_T)STRLEN(ml_get_curline());
|
|
|
9a55382 |
+ if (curwin->w_cursor.col > len)
|
|
|
9a55382 |
+ curwin->w_cursor.col = len;
|
|
|
9a55382 |
}
|
|
|
9a55382 |
else
|
|
|
9a55382 |
curwin->w_cursor.lnum = lnum;
|
|
|
9a55382 |
*** ../vim-7.0.041/src/version.c Sun Jul 23 22:07:55 2006
|
|
|
9a55382 |
--- src/version.c Sun Jul 23 22:35:13 2006
|
|
|
9a55382 |
***************
|
|
|
9a55382 |
*** 668,669 ****
|
|
|
9a55382 |
--- 668,671 ----
|
|
|
9a55382 |
{ /* Add new patch number below this line */
|
|
|
9a55382 |
+ /**/
|
|
|
9a55382 |
+ 42,
|
|
|
9a55382 |
/**/
|
|
|
9a55382 |
|
|
|
9a55382 |
--
|
|
|
9a55382 |
hundred-and-one symptoms of being an internet addict:
|
|
|
9a55382 |
45. You buy a Captain Kirk chair with a built-in keyboard and mouse.
|
|
|
9a55382 |
|
|
|
9a55382 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
9a55382 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
9a55382 |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
9a55382 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|