projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| c0949972 ER |
1 | To: vim-dev@vim.org |
| 2 | Subject: patch 7.1.105 | |
| 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.105 | |
| 11 | Problem: Internal error when using "0 ? {'a': 1} : {}". (A.Politz) | |
| 12 | Solution: When parsing a dictionary value without using the value, don't try | |
| 13 | obtaining the key name. | |
| 14 | Files: src/eval.c | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-7.1.104/src/eval.c Thu Sep 6 14:25:50 2007 | |
| 18 | --- src/eval.c Thu Sep 13 20:29:31 2007 | |
| 19 | *************** | |
| 20 | *** 6746,6765 **** | |
| 21 | clear_tv(&tvkey); | |
| 22 | goto failret; | |
| 23 | } | |
| 24 | ! key = get_tv_string_buf_chk(&tvkey, buf); | |
| 25 | ! if (key == NULL || *key == NUL) | |
| 26 | { | |
| 27 | ! /* "key" is NULL when get_tv_string_buf_chk() gave an errmsg */ | |
| 28 | ! if (key != NULL) | |
| 29 | ! EMSG(_(e_emptykey)); | |
| 30 | ! clear_tv(&tvkey); | |
| 31 | ! goto failret; | |
| 32 | } | |
| 33 | ||
| 34 | *arg = skipwhite(*arg + 1); | |
| 35 | if (eval1(arg, &tv, evaluate) == FAIL) /* recursive! */ | |
| 36 | { | |
| 37 | ! clear_tv(&tvkey); | |
| 38 | goto failret; | |
| 39 | } | |
| 40 | if (evaluate) | |
| 41 | --- 6746,6769 ---- | |
| 42 | clear_tv(&tvkey); | |
| 43 | goto failret; | |
| 44 | } | |
| 45 | ! if (evaluate) | |
| 46 | { | |
| 47 | ! key = get_tv_string_buf_chk(&tvkey, buf); | |
| 48 | ! if (key == NULL || *key == NUL) | |
| 49 | ! { | |
| 50 | ! /* "key" is NULL when get_tv_string_buf_chk() gave an errmsg */ | |
| 51 | ! if (key != NULL) | |
| 52 | ! EMSG(_(e_emptykey)); | |
| 53 | ! clear_tv(&tvkey); | |
| 54 | ! goto failret; | |
| 55 | ! } | |
| 56 | } | |
| 57 | ||
| 58 | *arg = skipwhite(*arg + 1); | |
| 59 | if (eval1(arg, &tv, evaluate) == FAIL) /* recursive! */ | |
| 60 | { | |
| 61 | ! if (evaluate) | |
| 62 | ! clear_tv(&tvkey); | |
| 63 | goto failret; | |
| 64 | } | |
| 65 | if (evaluate) | |
| 66 | *** ../vim-7.1.104/src/version.c Thu Sep 13 18:25:08 2007 | |
| 67 | --- src/version.c Thu Sep 13 20:36:38 2007 | |
| 68 | *************** | |
| 69 | *** 668,669 **** | |
| 70 | --- 668,671 ---- | |
| 71 | { /* Add new patch number below this line */ | |
| 72 | + /**/ | |
| 73 | + 105, | |
| 74 | /**/ | |
| 75 | ||
| 76 | -- | |
| 77 | DENNIS: Listen -- strange women lying in ponds distributing swords is no | |
| 78 | basis for a system of government. Supreme executive power derives | |
| 79 | from a mandate from the masses, not from some farcical aquatic | |
| 80 | ceremony. | |
| 81 | The Quest for the Holy Grail (Monty Python) | |
| 82 | ||
| 83 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 84 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 85 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 86 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |