|
 |
d099d94 |
To: vim_dev@googlegroups.com
|
|
|
d099d94 |
Subject: Patch 7.3.325
|
|
|
d099d94 |
Fcc: outbox
|
|
|
d099d94 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
d099d94 |
Mime-Version: 1.0
|
|
|
d099d94 |
Content-Type: text/plain; charset=UTF-8
|
|
|
d099d94 |
Content-Transfer-Encoding: 8bit
|
|
|
d099d94 |
------------
|
|
|
d099d94 |
|
|
|
d099d94 |
Patch 7.3.325
|
|
|
d099d94 |
Problem: A duplicated function argument gives an internal error.
|
|
|
d099d94 |
Solution: Give a proper error message. (based on patch by Tyru)
|
|
|
d099d94 |
Files: src/eval.c
|
|
|
d099d94 |
|
|
|
d099d94 |
|
|
|
d099d94 |
*** ../vim-7.3.324/src/eval.c 2011-09-14 16:52:02.000000000 +0200
|
|
|
d099d94 |
--- src/eval.c 2011-09-30 16:32:20.000000000 +0200
|
|
|
d099d94 |
***************
|
|
|
d099d94 |
*** 20461,20466 ****
|
|
|
d099d94 |
--- 20461,20467 ----
|
|
|
d099d94 |
exarg_T *eap;
|
|
|
d099d94 |
{
|
|
|
d099d94 |
char_u *theline;
|
|
|
d099d94 |
+ int i;
|
|
|
d099d94 |
int j;
|
|
|
d099d94 |
int c;
|
|
|
d099d94 |
int saved_did_emsg;
|
|
|
d099d94 |
***************
|
|
|
d099d94 |
*** 20707,20712 ****
|
|
|
d099d94 |
--- 20708,20722 ----
|
|
|
d099d94 |
arg = vim_strsave(arg);
|
|
|
d099d94 |
if (arg == NULL)
|
|
|
d099d94 |
goto erret;
|
|
|
d099d94 |
+
|
|
|
d099d94 |
+ /* Check for duplicate argument name. */
|
|
|
d099d94 |
+ for (i = 0; i < newargs.ga_len; ++i)
|
|
|
d099d94 |
+ if (STRCMP(((char_u **)(newargs.ga_data))[i], arg) == 0)
|
|
|
d099d94 |
+ {
|
|
|
d099d94 |
+ EMSG2(_("E853: Duplicate argument name: %s"), arg);
|
|
|
d099d94 |
+ goto erret;
|
|
|
d099d94 |
+ }
|
|
|
d099d94 |
+
|
|
|
d099d94 |
((char_u **)(newargs.ga_data))[newargs.ga_len] = arg;
|
|
|
d099d94 |
*p = c;
|
|
|
d099d94 |
newargs.ga_len++;
|
|
|
d099d94 |
*** ../vim-7.3.324/src/version.c 2011-09-30 16:23:21.000000000 +0200
|
|
|
d099d94 |
--- src/version.c 2011-09-30 16:39:16.000000000 +0200
|
|
|
d099d94 |
***************
|
|
|
d099d94 |
*** 711,712 ****
|
|
|
d099d94 |
--- 711,714 ----
|
|
|
d099d94 |
{ /* Add new patch number below this line */
|
|
|
d099d94 |
+ /**/
|
|
|
d099d94 |
+ 325,
|
|
|
d099d94 |
/**/
|
|
|
d099d94 |
|
|
|
d099d94 |
--
|
|
|
d099d94 |
hundred-and-one symptoms of being an internet addict:
|
|
|
d099d94 |
32. You don't know what sex three of your closest friends are, because they
|
|
|
d099d94 |
have neutral nicknames and you never bothered to ask.
|
|
|
d099d94 |
|
|
|
d099d94 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
d099d94 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
d099d94 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
d099d94 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|