projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| eb0ac1ae AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 6.2.129 | |
| 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.129 | |
| 11 | Problem: When 'number' is set 'wrapmargin' does not work Vi-compatible. | |
| 12 | (Yasuhiro Matsumoto) | |
| 13 | Solution: Reduce the textwidth when 'number' is set. Also for 'foldcolumn' | |
| 14 | and similar things. | |
| 15 | Files: src/edit.c | |
| 16 | ||
| 17 | ||
| 18 | *** ../vim-6.2.128/src/edit.c Sun Oct 12 17:10:47 2003 | |
| 19 | --- src/edit.c Mon Oct 20 13:26:58 2003 | |
| 20 | *************** | |
| 21 | *** 4472,4478 **** | |
| 22 | --- 4472,4499 ---- | |
| 23 | ||
| 24 | textwidth = curbuf->b_p_tw; | |
| 25 | if (textwidth == 0 && curbuf->b_p_wm) | |
| 26 | + { | |
| 27 | + /* The width is the window width minus 'wrapmargin' minus all the | |
| 28 | + * things that add to the margin. */ | |
| 29 | textwidth = W_WIDTH(curwin) - curbuf->b_p_wm; | |
| 30 | + #ifdef FEAT_CMDWIN | |
| 31 | + if (cmdwin_type != 0) | |
| 32 | + textwidth -= 1; | |
| 33 | + #endif | |
| 34 | + #ifdef FEAT_FOLDING | |
| 35 | + textwidth -= curwin->w_p_fdc; | |
| 36 | + #endif | |
| 37 | + #ifdef FEAT_SIGNS | |
| 38 | + if (curwin->w_buffer->b_signlist != NULL | |
| 39 | + # ifdef FEAT_NETBEANS_INTG | |
| 40 | + || usingNetbeans | |
| 41 | + # endif | |
| 42 | + ) | |
| 43 | + textwidth -= 1; | |
| 44 | + #endif | |
| 45 | + if (curwin->w_p_nu) | |
| 46 | + textwidth -= 8; | |
| 47 | + } | |
| 48 | if (textwidth < 0) | |
| 49 | textwidth = 0; | |
| 50 | if (ff && textwidth == 0) | |
| 51 | *** ../vim-6.2.128/src/version.c Thu Oct 23 14:10:16 2003 | |
| 52 | --- src/version.c Sun Oct 26 19:55:54 2003 | |
| 53 | *************** | |
| 54 | *** 639,640 **** | |
| 55 | --- 639,642 ---- | |
| 56 | { /* Add new patch number below this line */ | |
| 57 | + /**/ | |
| 58 | + 129, | |
| 59 | /**/ | |
| 60 | ||
| 61 | -- | |
| 62 | ARTHUR: Be quiet! | |
| 63 | DENNIS: Well you can't expect to wield supreme executive power just 'cause | |
| 64 | some watery tart threw a sword at you! | |
| 65 | ARTHUR: Shut up! | |
| 66 | DENNIS: I mean, if I went around sayin' I was an empereror just because some | |
| 67 | moistened bint had lobbed a scimitar at me they'd put me away! | |
| 68 | The Quest for the Holy Grail (Monty Python) | |
| 69 | ||
| 70 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 71 | /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ | |
| 72 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
| 73 | \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html /// |