| 6577e359 |
1 | To: vim-dev@vim.org |
| 2 | Subject: patch 7.1.042 |
| 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.042 (after 7.1.040) |
| 11 | Problem: Internal error when using matchadd(). (David Larson) |
| 12 | Solution: Check the third argument to be present before using the fourth |
| 13 | argument. (Martin Toft) |
| 14 | Files: src/eval.c |
| 15 | |
| 16 | |
| 17 | *** ../vim-7.1.041/src/eval.c Thu Jul 26 22:55:11 2007 |
| 18 | --- src/eval.c Fri Jul 27 21:29:39 2007 |
| 19 | *************** |
| 20 | *** 7108,7114 **** |
| 21 | {"getftype", 1, 1, f_getftype}, |
| 22 | {"getline", 1, 2, f_getline}, |
| 23 | {"getloclist", 1, 1, f_getqflist}, |
| 24 | ! {"getmatches", 0, 0, f_getmatches}, |
| 25 | {"getpos", 1, 1, f_getpos}, |
| 26 | {"getqflist", 0, 0, f_getqflist}, |
| 27 | {"getreg", 0, 2, f_getreg}, |
| 28 | --- 7108,7114 ---- |
| 29 | {"getftype", 1, 1, f_getftype}, |
| 30 | {"getline", 1, 2, f_getline}, |
| 31 | {"getloclist", 1, 1, f_getqflist}, |
| 32 | ! {"getmatches", 0, 0, f_getmatches}, |
| 33 | {"getpos", 1, 1, f_getpos}, |
| 34 | {"getqflist", 0, 0, f_getqflist}, |
| 35 | {"getreg", 0, 2, f_getreg}, |
| 36 | *************** |
| 37 | *** 12526,12534 **** |
| 38 | if (grp == NULL || pat == NULL) |
| 39 | return; |
| 40 | if (argvars[2].v_type != VAR_UNKNOWN) |
| 41 | prio = get_tv_number_chk(&argvars[2], &error); |
| 42 | ! if (argvars[3].v_type != VAR_UNKNOWN) |
| 43 | ! id = get_tv_number_chk(&argvars[3], &error); |
| 44 | if (error == TRUE) |
| 45 | return; |
| 46 | if (id >= 1 && id <= 3) |
| 47 | --- 12526,12536 ---- |
| 48 | if (grp == NULL || pat == NULL) |
| 49 | return; |
| 50 | if (argvars[2].v_type != VAR_UNKNOWN) |
| 51 | + { |
| 52 | prio = get_tv_number_chk(&argvars[2], &error); |
| 53 | ! if (argvars[3].v_type != VAR_UNKNOWN) |
| 54 | ! id = get_tv_number_chk(&argvars[3], &error); |
| 55 | ! } |
| 56 | if (error == TRUE) |
| 57 | return; |
| 58 | if (id >= 1 && id <= 3) |
| 59 | *** ../vim-7.1.041/src/version.c Thu Jul 26 23:10:50 2007 |
| 60 | --- src/version.c Fri Jul 27 21:31:13 2007 |
| 61 | *************** |
| 62 | *** 668,669 **** |
| 63 | --- 668,671 ---- |
| 64 | { /* Add new patch number below this line */ |
| 65 | + /**/ |
| 66 | + 42, |
| 67 | /**/ |
| 68 | |
| 69 | -- |
| 70 | The future isn't what it used to be. |
| 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://ICCF-Holland.org /// |
projects / packages / vim.git / blame