diff options
| author | Paul Eggert | 2011-04-02 22:44:38 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-02 22:44:38 -0700 |
| commit | e610eacace2a338cdc868db135863a9fea04d2bc (patch) | |
| tree | 6a638bc79e4d59ca5b17cbe74c6ec9d4db418823 /src/eval.c | |
| parent | b895abced91e6dcedf6c580ea3e51befc5c757c1 (diff) | |
| download | emacs-e610eacace2a338cdc868db135863a9fea04d2bc.tar.gz emacs-e610eacace2a338cdc868db135863a9fea04d2bc.zip | |
* eval.c (funcall_lambda): Rename local to avoid shadowing.
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/eval.c b/src/eval.c index 948c2e4d158..25afe7677f7 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -3206,26 +3206,26 @@ funcall_lambda (Lisp_Object fun, size_t nargs, | |||
| 3206 | optional = 1; | 3206 | optional = 1; |
| 3207 | else | 3207 | else |
| 3208 | { | 3208 | { |
| 3209 | Lisp_Object val; | 3209 | Lisp_Object arg; |
| 3210 | if (rest) | 3210 | if (rest) |
| 3211 | { | 3211 | { |
| 3212 | val = Flist (nargs - i, &arg_vector[i]); | 3212 | arg = Flist (nargs - i, &arg_vector[i]); |
| 3213 | i = nargs; | 3213 | i = nargs; |
| 3214 | } | 3214 | } |
| 3215 | else if (i < nargs) | 3215 | else if (i < nargs) |
| 3216 | val = arg_vector[i++]; | 3216 | arg = arg_vector[i++]; |
| 3217 | else if (!optional) | 3217 | else if (!optional) |
| 3218 | xsignal2 (Qwrong_number_of_arguments, fun, make_number (nargs)); | 3218 | xsignal2 (Qwrong_number_of_arguments, fun, make_number (nargs)); |
| 3219 | else | 3219 | else |
| 3220 | val = Qnil; | 3220 | arg = Qnil; |
| 3221 | 3221 | ||
| 3222 | /* Bind the argument. */ | 3222 | /* Bind the argument. */ |
| 3223 | if (!NILP (lexenv) && SYMBOLP (next)) | 3223 | if (!NILP (lexenv) && SYMBOLP (next)) |
| 3224 | /* Lexically bind NEXT by adding it to the lexenv alist. */ | 3224 | /* Lexically bind NEXT by adding it to the lexenv alist. */ |
| 3225 | lexenv = Fcons (Fcons (next, val), lexenv); | 3225 | lexenv = Fcons (Fcons (next, arg), lexenv); |
| 3226 | else | 3226 | else |
| 3227 | /* Dynamically bind NEXT. */ | 3227 | /* Dynamically bind NEXT. */ |
| 3228 | specbind (next, val); | 3228 | specbind (next, arg); |
| 3229 | } | 3229 | } |
| 3230 | } | 3230 | } |
| 3231 | 3231 | ||