projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| c936e692 AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.2.277 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.2.277 | |
| 11 | Problem: CTRL-Y in a diff'ed window may move the cursor outside of the | |
| 12 | window. (Lech Lorens) | |
| 13 | Solution: Limit the number of filler lines to the height of the window. | |
| 14 | Don't reset filler lines to zero for an empty buffer. | |
| 15 | Files: src/move.c | |
| 16 | ||
| 17 | ||
| 18 | *** ../vim-7.2.276/src/move.c 2009-05-15 21:31:11.000000000 +0200 | |
| 19 | --- src/move.c 2009-11-03 14:39:55.000000000 +0100 | |
| 20 | *************** | |
| 21 | *** 183,191 **** | |
| 22 | if (curwin->w_topline != 1) | |
| 23 | redraw_later(NOT_VALID); | |
| 24 | curwin->w_topline = 1; | |
| 25 | - #ifdef FEAT_DIFF | |
| 26 | - curwin->w_topfill = 0; | |
| 27 | - #endif | |
| 28 | curwin->w_botline = 2; | |
| 29 | curwin->w_valid |= VALID_BOTLINE|VALID_BOTLINE_AP; | |
| 30 | #ifdef FEAT_SCROLLBIND | |
| 31 | --- 183,188 ---- | |
| 32 | *************** | |
| 33 | *** 1257,1263 **** | |
| 34 | while (line_count-- > 0) | |
| 35 | { | |
| 36 | #ifdef FEAT_DIFF | |
| 37 | ! if (curwin->w_topfill < diff_check(curwin, curwin->w_topline)) | |
| 38 | { | |
| 39 | ++curwin->w_topfill; | |
| 40 | ++done; | |
| 41 | --- 1254,1261 ---- | |
| 42 | while (line_count-- > 0) | |
| 43 | { | |
| 44 | #ifdef FEAT_DIFF | |
| 45 | ! if (curwin->w_topfill < diff_check(curwin, curwin->w_topline) | |
| 46 | ! && curwin->w_topfill < curwin->w_height - 1) | |
| 47 | { | |
| 48 | ++curwin->w_topfill; | |
| 49 | ++done; | |
| 50 | *** ../vim-7.2.276/src/version.c 2009-11-03 16:03:59.000000000 +0100 | |
| 51 | --- src/version.c 2009-11-03 16:22:04.000000000 +0100 | |
| 52 | *************** | |
| 53 | *** 678,679 **** | |
| 54 | --- 678,681 ---- | |
| 55 | { /* Add new patch number below this line */ | |
| 56 | + /**/ | |
| 57 | + 277, | |
| 58 | /**/ | |
| 59 | ||
| 60 | -- | |
| 61 | SIGFUN -- signature too funny (core dumped) | |
| 62 | ||
| 63 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 64 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 65 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 66 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |