projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 7bf01cab ER |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.1.152 | |
| 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.1.152 | |
| 11 | Problem: Display problem when 'hls' and 'cursorcolumn' are set and | |
| 12 | searching for "$". (John Mullin) Also when scrolling | |
| 13 | horizontally when 'wrap' is off. | |
| 14 | Solution: Keep track of the column where highlighting was set. Check the | |
| 15 | column offset when skipping characters. | |
| 16 | Files: src/screen.c | |
| 17 | ||
| 18 | ||
| 19 | *** ../vim-7.1.151/src/screen.c Mon Sep 17 22:37:05 2007 | |
| 20 | --- src/screen.c Fri Oct 19 15:18:49 2007 | |
| 21 | *************** | |
| 22 | *** 2599,2604 **** | |
| 23 | --- 2599,2605 ---- | |
| 24 | int syntax_attr = 0; /* attributes desired by syntax */ | |
| 25 | int has_syntax = FALSE; /* this buffer has syntax highl. */ | |
| 26 | int save_did_emsg; | |
| 27 | + int eol_hl_off = 0; /* 1 if highlighted char after EOL */ | |
| 28 | #endif | |
| 29 | #ifdef FEAT_SPELL | |
| 30 | int has_spell = FALSE; /* this buffer has spell checking */ | |
| 31 | *************** | |
| 32 | *** 4312,4317 **** | |
| 33 | --- 4313,4322 ---- | |
| 34 | { | |
| 35 | #ifdef FEAT_SEARCH_EXTRA | |
| 36 | long prevcol = (long)(ptr - line) - (c == NUL); | |
| 37 | + | |
| 38 | + /* we're not really at that column when skipping some text */ | |
| 39 | + if ((wp->w_p_wrap ? wp->w_skipcol : wp->w_leftcol) > prevcol) | |
| 40 | + ++prevcol; | |
| 41 | #endif | |
| 42 | ||
| 43 | /* invert at least one char, used for Visual and empty line or | |
| 44 | *************** | |
| 45 | *** 4408,4418 **** | |
| 46 | --- 4413,4432 ---- | |
| 47 | ScreenAttrs[off] = char_attr; | |
| 48 | #ifdef FEAT_RIGHTLEFT | |
| 49 | if (wp->w_p_rl) | |
| 50 | + { | |
| 51 | --col; | |
| 52 | + --off; | |
| 53 | + } | |
| 54 | else | |
| 55 | #endif | |
| 56 | + { | |
| 57 | ++col; | |
| 58 | + ++off; | |
| 59 | + } | |
| 60 | ++vcol; | |
| 61 | + #ifdef FEAT_SYN_HL | |
| 62 | + eol_hl_off = 1; | |
| 63 | + #endif | |
| 64 | } | |
| 65 | } | |
| 66 | ||
| 67 | *************** | |
| 68 | *** 4422,4427 **** | |
| 69 | --- 4436,4449 ---- | |
| 70 | if (c == NUL) | |
| 71 | { | |
| 72 | #ifdef FEAT_SYN_HL | |
| 73 | + if (eol_hl_off > 0 && vcol - eol_hl_off == (long)wp->w_virtcol) | |
| 74 | + { | |
| 75 | + /* highlight last char after line */ | |
| 76 | + --col; | |
| 77 | + --off; | |
| 78 | + --vcol; | |
| 79 | + } | |
| 80 | + | |
| 81 | /* Highlight 'cursorcolumn' past end of the line. */ | |
| 82 | if (wp->w_p_wrap) | |
| 83 | v = wp->w_skipcol; | |
| 84 | *************** | |
| 85 | *** 4432,4438 **** | |
| 86 | ||
| 87 | vcol = v + col - win_col_off(wp); | |
| 88 | if (wp->w_p_cuc | |
| 89 | ! && (int)wp->w_virtcol >= vcol | |
| 90 | && (int)wp->w_virtcol < W_WIDTH(wp) * (row - startrow + 1) | |
| 91 | + v | |
| 92 | && lnum != wp->w_cursor.lnum | |
| 93 | --- 4454,4460 ---- | |
| 94 | ||
| 95 | vcol = v + col - win_col_off(wp); | |
| 96 | if (wp->w_p_cuc | |
| 97 | ! && (int)wp->w_virtcol >= vcol - eol_hl_off | |
| 98 | && (int)wp->w_virtcol < W_WIDTH(wp) * (row - startrow + 1) | |
| 99 | + v | |
| 100 | && lnum != wp->w_cursor.lnum | |
| 101 | *** ../vim-7.1.151/src/version.c Thu Nov 8 13:03:33 2007 | |
| 102 | --- src/version.c Thu Nov 8 14:48:59 2007 | |
| 103 | *************** | |
| 104 | *** 668,669 **** | |
| 105 | --- 668,671 ---- | |
| 106 | { /* Add new patch number below this line */ | |
| 107 | + /**/ | |
| 108 | + 152, | |
| 109 | /**/ | |
| 110 | ||
| 111 | -- | |
| 112 | From "know your smileys": | |
| 113 | 2B|^2B Message from Shakespeare | |
| 114 | ||
| 115 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 116 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 117 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 118 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |