diff options
author | Bram Moolenaar <bram@vim.org> | 2011-11-30 17:01:58 +0100 |
---|---|---|
committer | Bram Moolenaar <bram@vim.org> | 2011-11-30 17:01:58 +0100 |
commit | 607f959aae36850f013eb7ddc279a17fc87db1de (patch) | |
tree | 9cca0ae208b19e580bee54c82063372e6f798239 /src | |
parent | 9968b489b60a30ac4bd7275821d584f2a0512320 (diff) | |
download | vim-607f959aae36850f013eb7ddc279a17fc87db1de.tar.gz |
Problem: ml_get error when using ":g" with folded lines.
Solution: Adjust the line number for changed_lines(). (Christian Brabandt)
Diffstat (limited to 'src')
-rw-r--r-- | src/ex_cmds.c | 8 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c index 33021d29..e81b4a2b 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -820,7 +820,13 @@ do_move(line1, line2, dest) curwin->w_cursor.lnum = dest + (line2 - line1) + 1; if (line1 < dest) - changed_lines(line1, 0, dest + num_lines + 1, 0L); + { + dest += num_lines + 1; + last_line = curbuf->b_ml.ml_line_count; + if (dest > last_line + 1) + dest = last_line + 1; + changed_lines(line1, 0, dest, 0L); + } else changed_lines(dest + 1, 0, line1 + num_lines, 0L); diff --git a/src/version.c b/src/version.c index 35b51988..99d6a79a 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 362, +/**/ 361, /**/ 360, |