projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| a9440a39 AM |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 6.3.070 | |
| 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.3.070 | |
| 11 | Problem: After ":set number linebreak wrap" and a vertical split, moving | |
| 12 | the vertical separator far left will crash Vim. (Georg Dahn) | |
| 13 | Solution: Avoid dividing by zero. | |
| 14 | Files: src/charset.c | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-6.3.019/src/charset.c Wed Jun 9 14:56:26 2004 | |
| 18 | --- src/charset.c Sun Apr 10 17:35:14 2005 | |
| 19 | *************** | |
| 20 | *** 1005,1010 **** | |
| 21 | --- 1005,1011 ---- | |
| 22 | int numberextra; | |
| 23 | char_u *ps; | |
| 24 | int tab_corr = (*s == TAB); | |
| 25 | + int n; | |
| 26 | ||
| 27 | /* | |
| 28 | * No 'linebreak' and 'showbreak': return quickly. | |
| 29 | *************** | |
| 30 | *** 1048,1056 **** | |
| 31 | col2 = col; | |
| 32 | colmax = W_WIDTH(wp) - numberextra; | |
| 33 | if (col >= colmax) | |
| 34 | ! colmax += (((col - colmax) | |
| 35 | ! / (colmax + win_col_off2(wp))) + 1) | |
| 36 | ! * (colmax + win_col_off2(wp)); | |
| 37 | for (;;) | |
| 38 | { | |
| 39 | ps = s; | |
| 40 | --- 1049,1060 ---- | |
| 41 | col2 = col; | |
| 42 | colmax = W_WIDTH(wp) - numberextra; | |
| 43 | if (col >= colmax) | |
| 44 | ! { | |
| 45 | ! n = colmax + win_col_off2(wp); | |
| 46 | ! if (n > 0) | |
| 47 | ! colmax += (((col - colmax) / n) + 1) * n; | |
| 48 | ! } | |
| 49 | ! | |
| 50 | for (;;) | |
| 51 | { | |
| 52 | ps = s; | |
| 53 | *** ../vim-6.3.019/src/version.c Mon Apr 11 11:38:29 2005 | |
| 54 | --- src/version.c Mon Apr 11 11:40:47 2005 | |
| 55 | *************** | |
| 56 | *** 643,644 **** | |
| 57 | --- 643,646 ---- | |
| 58 | { /* Add new patch number below this line */ | |
| 59 | + /**/ | |
| 60 | + 70, | |
| 61 | /**/ | |
| 62 | ||
| 63 | -- | |
| 64 | hundred-and-one symptoms of being an internet addict: | |
| 65 | 100. The most exciting sporting events you noticed during summer 1996 | |
| 66 | was Netscape vs. Microsoft. | |
| 67 | ||
| 68 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 69 | /// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 70 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
| 71 | \\\ Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html /// |