projects / ipfire-3.x.git / blame
| Commit | Line | Data |
|---|---|---|
| c6060300 MT |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.325 | |
| 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.325 | |
| 11 | Problem: A duplicated function argument gives an internal error. | |
| 12 | Solution: Give a proper error message. (based on patch by Tyru) | |
| 13 | Files: src/eval.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.3.324/src/eval.c 2011-09-14 16:52:02.000000000 +0200 | |
| 17 | --- src/eval.c 2011-09-30 16:32:20.000000000 +0200 | |
| 18 | *************** | |
| 19 | *** 20461,20466 **** | |
| 20 | --- 20461,20467 ---- | |
| 21 | exarg_T *eap; | |
| 22 | { | |
| 23 | char_u *theline; | |
| 24 | + int i; | |
| 25 | int j; | |
| 26 | int c; | |
| 27 | int saved_did_emsg; | |
| 28 | *************** | |
| 29 | *** 20707,20712 **** | |
| 30 | --- 20708,20722 ---- | |
| 31 | arg = vim_strsave(arg); | |
| 32 | if (arg == NULL) | |
| 33 | goto erret; | |
| 34 | + | |
| 35 | + /* Check for duplicate argument name. */ | |
| 36 | + for (i = 0; i < newargs.ga_len; ++i) | |
| 37 | + if (STRCMP(((char_u **)(newargs.ga_data))[i], arg) == 0) | |
| 38 | + { | |
| 39 | + EMSG2(_("E853: Duplicate argument name: %s"), arg); | |
| 40 | + goto erret; | |
| 41 | + } | |
| 42 | + | |
| 43 | ((char_u **)(newargs.ga_data))[newargs.ga_len] = arg; | |
| 44 | *p = c; | |
| 45 | newargs.ga_len++; | |
| 46 | *** ../vim-7.3.324/src/version.c 2011-09-30 16:23:21.000000000 +0200 | |
| 47 | --- src/version.c 2011-09-30 16:39:16.000000000 +0200 | |
| 48 | *************** | |
| 49 | *** 711,712 **** | |
| 50 | --- 711,714 ---- | |
| 51 | { /* Add new patch number below this line */ | |
| 52 | + /**/ | |
| 53 | + 325, | |
| 54 | /**/ | |
| 55 | ||
| 56 | -- | |
| 57 | hundred-and-one symptoms of being an internet addict: | |
| 58 | 32. You don't know what sex three of your closest friends are, because they | |
| 59 | have neutral nicknames and you never bothered to ask. | |
| 60 | ||
| 61 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 62 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 63 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
| 64 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |