projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 4ff12b6a ER |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.2.255 | |
| 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.255 (after 7.2.242) | |
| 11 | Problem: Setting 'rightleft', 'linebreak' and 'wrap' may cause cursor to be | |
| 12 | in wrong place. | |
| 13 | Solution: Recompute the cursor column for these options. | |
| 14 | Files: src/option.c | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-7.2.254/src/option.c 2009-07-29 15:41:32.000000000 +0200 | |
| 18 | --- src/option.c 2009-09-11 13:59:55.000000000 +0200 | |
| 19 | *************** | |
| 20 | *** 7430,7435 **** | |
| 21 | --- 7430,7437 ---- | |
| 22 | { | |
| 23 | if (curwin->w_p_wrap) | |
| 24 | curwin->w_leftcol = 0; | |
| 25 | + if (curwin->w_curswant != MAXCOL) | |
| 26 | + curwin->w_set_curswant = TRUE; | |
| 27 | } | |
| 28 | ||
| 29 | #ifdef FEAT_WINDOWS | |
| 30 | *************** | |
| 31 | *** 7664,7669 **** | |
| 32 | --- 7666,7687 ---- | |
| 33 | } | |
| 34 | #endif | |
| 35 | ||
| 36 | + #ifdef FEAT_LINEBREAK | |
| 37 | + if ((int *)varp == &curwin->w_p_lbr) | |
| 38 | + { | |
| 39 | + if (curwin->w_curswant != MAXCOL) | |
| 40 | + curwin->w_set_curswant = TRUE; | |
| 41 | + } | |
| 42 | + #endif | |
| 43 | + | |
| 44 | + #ifdef FEAT_RIGHTLEFT | |
| 45 | + if ((int *)varp == &curwin->w_p_rl) | |
| 46 | + { | |
| 47 | + if (curwin->w_curswant != MAXCOL) | |
| 48 | + curwin->w_set_curswant = TRUE; | |
| 49 | + } | |
| 50 | + #endif | |
| 51 | + | |
| 52 | /* | |
| 53 | * End of handling side effects for bool options. | |
| 54 | */ | |
| 55 | *** ../vim-7.2.254/src/version.c 2009-09-11 15:04:13.000000000 +0200 | |
| 56 | --- src/version.c 2009-09-11 15:19:40.000000000 +0200 | |
| 57 | *************** | |
| 58 | *** 678,679 **** | |
| 59 | --- 678,681 ---- | |
| 60 | { /* Add new patch number below this line */ | |
| 61 | + /**/ | |
| 62 | + 255, | |
| 63 | /**/ | |
| 64 | ||
| 65 | -- | |
| 66 | A computer without Windows is like a fish without a bicycle. | |
| 67 | ||
| 68 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 69 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 70 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 71 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |