projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| ad28a8ff AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: patch 7.1.016 | |
| 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.016 (after patch 7.1.012) | |
| 11 | Problem: Error message about setting 'diff' to a string. | |
| 12 | Solution: Don't pass an empty string to set_option_value() when setting | |
| 13 | 'diff'. | |
| 14 | Files: src/quickfix.c, src/popupmnu.c | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-7.1.015/src/quickfix.c Sun Feb 4 02:58:00 2007 | |
| 18 | --- src/quickfix.c Thu Jun 28 18:56:16 2007 | |
| 19 | *************** | |
| 20 | *** 2331,2337 **** | |
| 21 | set_option_value((char_u *)"bt", 0L, (char_u *)"quickfix", | |
| 22 | OPT_LOCAL); | |
| 23 | set_option_value((char_u *)"bh", 0L, (char_u *)"wipe", OPT_LOCAL); | |
| 24 | ! set_option_value((char_u *)"diff", 0L, (char_u *)"", OPT_LOCAL); | |
| 25 | } | |
| 26 | ||
| 27 | /* Only set the height when still in the same tab page and there is no | |
| 28 | --- 2331,2337 ---- | |
| 29 | set_option_value((char_u *)"bt", 0L, (char_u *)"quickfix", | |
| 30 | OPT_LOCAL); | |
| 31 | set_option_value((char_u *)"bh", 0L, (char_u *)"wipe", OPT_LOCAL); | |
| 32 | ! set_option_value((char_u *)"diff", 0L, NULL, OPT_LOCAL); | |
| 33 | } | |
| 34 | ||
| 35 | /* Only set the height when still in the same tab page and there is no | |
| 36 | *** ../vim-7.1.015/src/popupmnu.c Tue Mar 27 12:42:05 2007 | |
| 37 | --- src/popupmnu.c Thu Jun 28 19:00:51 2007 | |
| 38 | *************** | |
| 39 | *** 466,472 **** | |
| 40 | set_option_value((char_u *)"bh", 0L, | |
| 41 | (char_u *)"wipe", OPT_LOCAL); | |
| 42 | set_option_value((char_u *)"diff", 0L, | |
| 43 | ! (char_u *)"", OPT_LOCAL); | |
| 44 | } | |
| 45 | } | |
| 46 | if (res == OK) | |
| 47 | --- 466,472 ---- | |
| 48 | set_option_value((char_u *)"bh", 0L, | |
| 49 | (char_u *)"wipe", OPT_LOCAL); | |
| 50 | set_option_value((char_u *)"diff", 0L, | |
| 51 | ! NULL, OPT_LOCAL); | |
| 52 | } | |
| 53 | } | |
| 54 | if (res == OK) | |
| 55 | *** ../vim-7.1.015/src/version.c Thu Jun 28 13:02:22 2007 | |
| 56 | --- src/version.c Thu Jun 28 21:20:20 2007 | |
| 57 | *************** | |
| 58 | *** 668,669 **** | |
| 59 | --- 668,671 ---- | |
| 60 | { /* Add new patch number below this line */ | |
| 61 | + /**/ | |
| 62 | + 16, | |
| 63 | /**/ | |
| 64 | ||
| 65 | -- | |
| 66 | We do not stumble over mountains, but over molehills. | |
| 67 | Confucius | |
| 68 | ||
| 69 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 70 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 71 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 72 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |