projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 717fd8f6 AF |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 6.2.088 | |
| 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.2.088 | |
| 11 | Problem: When 'sidescrolloff' is set 'showmatch' doesn't work correctly if | |
| 12 | the match is less than 'sidescrolloff' off from the side of the | |
| 13 | window. (Roland Stahn) | |
| 14 | Solution: Set 'sidescrolloff' to zero while displaying the match. | |
| 15 | Files: src/search.c | |
| 16 | ||
| 17 | ||
| 18 | *** ../vim-6.2.087/src/search.c Thu Sep 11 21:31:02 2003 | |
| 19 | --- src/search.c Sun Sep 7 22:47:43 2003 | |
| 20 | *************** | |
| 21 | *** 2149,2154 **** | |
| 22 | --- 2149,2155 ---- | |
| 23 | pos_T mpos; | |
| 24 | colnr_T vcol; | |
| 25 | long save_so; | |
| 26 | + long save_siso; | |
| 27 | #ifdef CURSOR_SHAPE | |
| 28 | int save_state; | |
| 29 | #endif | |
| 30 | *************** | |
| 31 | *** 2166,2171 **** | |
| 32 | --- 2167,2173 ---- | |
| 33 | mpos = *lpos; /* save the pos, update_screen() may change it */ | |
| 34 | save_cursor = curwin->w_cursor; | |
| 35 | save_so = p_so; | |
| 36 | + save_siso = p_siso; | |
| 37 | /* Handle "$" in 'cpo': If the ')' is typed on top of the "$", | |
| 38 | * stop displaying the "$". */ | |
| 39 | if (dollar_vcol > 0 && dollar_vcol == curwin->w_virtcol) | |
| 40 | *************** | |
| 41 | *** 2181,2186 **** | |
| 42 | --- 2183,2189 ---- | |
| 43 | #endif | |
| 44 | curwin->w_cursor = mpos; /* move to matching char */ | |
| 45 | p_so = 0; /* don't use 'scrolloff' here */ | |
| 46 | + p_siso = 0; /* don't use 'sidescrolloff' here */ | |
| 47 | showruler(FALSE); | |
| 48 | setcursor(); | |
| 49 | cursor_on(); /* make sure that the cursor is shown */ | |
| 50 | *************** | |
| 51 | *** 2192,2198 **** | |
| 52 | gui_mch_flush(); | |
| 53 | } | |
| 54 | #endif | |
| 55 | ! /* Restore collar_vcol(), because setcursor() may call curs_rows() | |
| 56 | * which resets it if the matching position is in a previous line | |
| 57 | * and has a higher column number. */ | |
| 58 | dollar_vcol = save_dollar_vcol; | |
| 59 | --- 2195,2201 ---- | |
| 60 | gui_mch_flush(); | |
| 61 | } | |
| 62 | #endif | |
| 63 | ! /* Restore dollar_vcol(), because setcursor() may call curs_rows() | |
| 64 | * which resets it if the matching position is in a previous line | |
| 65 | * and has a higher column number. */ | |
| 66 | dollar_vcol = save_dollar_vcol; | |
| 67 | *************** | |
| 68 | *** 2207,2212 **** | |
| 69 | --- 2210,2216 ---- | |
| 70 | ui_delay(p_mat * 100L, FALSE); | |
| 71 | curwin->w_cursor = save_cursor; /* restore cursor position */ | |
| 72 | p_so = save_so; | |
| 73 | + p_siso = save_siso; | |
| 74 | #ifdef CURSOR_SHAPE | |
| 75 | State = save_state; | |
| 76 | ui_cursor_shape(); /* may show different cursor shape */ | |
| 77 | *** ../vim-6.2.087/src/version.c Thu Sep 11 21:36:02 2003 | |
| 78 | --- src/version.c Thu Sep 11 21:37:39 2003 | |
| 79 | *************** | |
| 80 | *** 632,633 **** | |
| 81 | --- 632,635 ---- | |
| 82 | { /* Add new patch number below this line */ | |
| 83 | + /**/ | |
| 84 | + 88, | |
| 85 | /**/ | |
| 86 | ||
| 87 | -- | |
| 88 | A parent can be arrested if his child cannot hold back a burp during a church | |
| 89 | service. | |
| 90 | [real standing law in Nebraska, United States of America] | |
| 91 | ||
| 92 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 93 | /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ | |
| 94 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
| 95 | \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html /// |