projects / people / arne_f / ipfire-3.x.git / blame
| Commit | Line | Data |
|---|---|---|
| c6060300 MT |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.329 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.3.329 | |
| 11 | Problem: When skipping over code from ":for" to ":endfor" get an error for | |
| 12 | calling a dict function. (Yasuhiro Matsumoto) | |
| 13 | Solution: Ignore errors when skipping over :call command. | |
| 14 | Files: src/ex_docmd.c, src/eval.c | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-7.3.328/src/ex_docmd.c 2011-09-21 19:10:42.000000000 +0200 | |
| 18 | --- src/ex_docmd.c 2011-09-30 17:59:51.000000000 +0200 | |
| 19 | *************** | |
| 20 | *** 371,381 **** | |
| 21 | # define ex_endif ex_ni | |
| 22 | # define ex_else ex_ni | |
| 23 | # define ex_while ex_ni | |
| 24 | - # define ex_for ex_ni | |
| 25 | # define ex_continue ex_ni | |
| 26 | # define ex_break ex_ni | |
| 27 | # define ex_endwhile ex_ni | |
| 28 | - # define ex_endfor ex_ni | |
| 29 | # define ex_throw ex_ni | |
| 30 | # define ex_try ex_ni | |
| 31 | # define ex_catch ex_ni | |
| 32 | --- 371,379 ---- | |
| 33 | *** ../vim-7.3.328/src/eval.c 2011-09-30 16:39:41.000000000 +0200 | |
| 34 | --- src/eval.c 2011-09-30 18:29:58.000000000 +0200 | |
| 35 | *************** | |
| 36 | *** 3377,3383 **** | |
| 37 | /* trans_function_name() doesn't work well when skipping, use eval0() | |
| 38 | * instead to skip to any following command, e.g. for: | |
| 39 | * :if 0 | call dict.foo().bar() | endif */ | |
| 40 | ! eval0(eap->arg, &rettv, &eap->nextcmd, FALSE); | |
| 41 | return; | |
| 42 | } | |
| 43 | ||
| 44 | --- 3377,3386 ---- | |
| 45 | /* trans_function_name() doesn't work well when skipping, use eval0() | |
| 46 | * instead to skip to any following command, e.g. for: | |
| 47 | * :if 0 | call dict.foo().bar() | endif */ | |
| 48 | ! ++emsg_skip; | |
| 49 | ! if (eval0(eap->arg, &rettv, &eap->nextcmd, FALSE) != FAIL) | |
| 50 | ! clear_tv(&rettv); | |
| 51 | ! --emsg_skip; | |
| 52 | return; | |
| 53 | } | |
| 54 | ||
| 55 | *** ../vim-7.3.328/src/version.c 2011-09-30 17:46:14.000000000 +0200 | |
| 56 | --- src/version.c 2011-09-30 18:32:27.000000000 +0200 | |
| 57 | *************** | |
| 58 | *** 711,712 **** | |
| 59 | --- 711,714 ---- | |
| 60 | { /* Add new patch number below this line */ | |
| 61 | + /**/ | |
| 62 | + 329, | |
| 63 | /**/ | |
| 64 | ||
| 65 | -- | |
| 66 | Have you heard about the new Beowulf cluster? It's so fast, it executes | |
| 67 | an infinite loop in 6 seconds. | |
| 68 | ||
| 69 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 70 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 71 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
| 72 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |