projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 41587d9d AM |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 6.4.008 | |
| 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 6.4.008 | |
| 11 | Problem: Hang in search for 'hlsearch' highlighting. (Yukihiro Nakadaira) | |
| 12 | Solution: Skip over (multi-byte) character instead of single byte. | |
| 13 | Files: src/screen.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-6.4.007/src/screen.c Wed Jan 19 11:03:00 2005 | |
| 17 | --- src/screen.c Sat Feb 25 14:34:41 2006 | |
| 18 | *************** | |
| 19 | *** 5803,5814 **** | |
| 20 | || (shl->rm.endpos[0].lnum == 0 | |
| 21 | && shl->rm.endpos[0].col == shl->rm.startpos[0].col)) | |
| 22 | { | |
| 23 | ! matchcol = shl->rm.startpos[0].col + 1; | |
| 24 | ! if (ml_get_buf(shl->buf, lnum, FALSE)[matchcol - 1] == NUL) | |
| 25 | { | |
| 26 | shl->lnum = 0; | |
| 27 | break; | |
| 28 | } | |
| 29 | } | |
| 30 | else | |
| 31 | matchcol = shl->rm.endpos[0].col; | |
| 32 | --- 5803,5824 ---- | |
| 33 | || (shl->rm.endpos[0].lnum == 0 | |
| 34 | && shl->rm.endpos[0].col == shl->rm.startpos[0].col)) | |
| 35 | { | |
| 36 | ! char_u *ml; | |
| 37 | ! | |
| 38 | ! matchcol = shl->rm.startpos[0].col; | |
| 39 | ! ml = ml_get_buf(shl->buf, lnum, FALSE) + matchcol; | |
| 40 | ! if (*ml == NUL) | |
| 41 | { | |
| 42 | + ++matchcol; | |
| 43 | shl->lnum = 0; | |
| 44 | break; | |
| 45 | } | |
| 46 | + #ifdef FEAT_MBYTE | |
| 47 | + if (has_mbyte) | |
| 48 | + matchcol += mb_ptr2len_check(ml); | |
| 49 | + else | |
| 50 | + #endif | |
| 51 | + ++matchcol; | |
| 52 | } | |
| 53 | else | |
| 54 | matchcol = shl->rm.endpos[0].col; | |
| 55 | *** ../vim-6.4.007/src/version.c Wed Feb 8 11:11:51 2006 | |
| 56 | --- src/version.c Sat Feb 25 14:37:36 2006 | |
| 57 | *************** | |
| 58 | *** 643,644 **** | |
| 59 | --- 643,646 ---- | |
| 60 | { /* Add new patch number below this line */ | |
| 61 | + /**/ | |
| 62 | + 8, | |
| 63 | /**/ | |
| 64 | ||
| 65 | -- | |
| 66 | Team-building exercises come in many forms but they all trace their roots back | |
| 67 | to the prison system. In your typical team-building exercise the employees | |
| 68 | are subjected to a variety of unpleasant situations until they become either a | |
| 69 | cohesive team or a ring of car jackers. | |
| 70 | (Scott Adams - The Dilbert principle) | |
| 71 | ||
| 72 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 73 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 74 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 75 | \\\ help me help AIDS victims -- http://www.ICCF.nl /// |