projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 3db12ce3 ER |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.2.023 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=ISO-8859-1 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.2.023 | |
| 11 | Problem: 'cursorcolumn' is in the wrong place in a closed fold when the | |
| 12 | display is shifted left. (Gary Johnson) | |
| 13 | Solution: Subtract w_skipcol or w_leftcol when needed. | |
| 14 | Files: src/screen.c | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-7.2.022/src/screen.c Thu Jul 24 20:29:09 2008 | |
| 18 | --- src/screen.c Fri Sep 26 21:23:06 2008 | |
| 19 | *************** | |
| 20 | *** 2439,2447 **** | |
| 21 | ||
| 22 | #ifdef FEAT_SYN_HL | |
| 23 | /* Show 'cursorcolumn' in the fold line. */ | |
| 24 | ! if (wp->w_p_cuc && (int)wp->w_virtcol + txtcol < W_WIDTH(wp)) | |
| 25 | ! ScreenAttrs[off + wp->w_virtcol + txtcol] = hl_combine_attr( | |
| 26 | ! ScreenAttrs[off + wp->w_virtcol + txtcol], hl_attr(HLF_CUC)); | |
| 27 | #endif | |
| 28 | ||
| 29 | SCREEN_LINE(row + W_WINROW(wp), W_WINCOL(wp), (int)W_WIDTH(wp), | |
| 30 | --- 2439,2455 ---- | |
| 31 | ||
| 32 | #ifdef FEAT_SYN_HL | |
| 33 | /* Show 'cursorcolumn' in the fold line. */ | |
| 34 | ! if (wp->w_p_cuc) | |
| 35 | ! { | |
| 36 | ! txtcol += wp->w_virtcol; | |
| 37 | ! if (wp->w_p_wrap) | |
| 38 | ! txtcol -= wp->w_skipcol; | |
| 39 | ! else | |
| 40 | ! txtcol -= wp->w_leftcol; | |
| 41 | ! if (txtcol >= 0 && txtcol < W_WIDTH(wp)) | |
| 42 | ! ScreenAttrs[off + txtcol] = hl_combine_attr( | |
| 43 | ! ScreenAttrs[off + txtcol], hl_attr(HLF_CUC)); | |
| 44 | ! } | |
| 45 | #endif | |
| 46 | ||
| 47 | SCREEN_LINE(row + W_WINROW(wp), W_WINCOL(wp), (int)W_WIDTH(wp), | |
| 48 | *** ../vim-7.2.022/src/version.c Sat Sep 20 16:26:10 2008 | |
| 49 | --- src/version.c Wed Oct 1 21:07:31 2008 | |
| 50 | *************** | |
| 51 | *** 678,679 **** | |
| 52 | --- 678,681 ---- | |
| 53 | { /* Add new patch number below this line */ | |
| 54 | + /**/ | |
| 55 | + 23, | |
| 56 | /**/ | |
| 57 | ||
| 58 | -- | |
| 59 | hundred-and-one symptoms of being an internet addict: | |
| 60 | 124. You begin conversations with, "Who is your internet service provider?" | |
| 61 | ||
| 62 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 63 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 64 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 65 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |