diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-02 22:44:38 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-02 22:44:38 -0700 |
| commit | e610eacace2a338cdc868db135863a9fea04d2bc (patch) | |
| tree | 6a638bc79e4d59ca5b17cbe74c6ec9d4db418823 /src | |
| parent | b895abced91e6dcedf6c580ea3e51befc5c757c1 (diff) | |
* eval.c (funcall_lambda): Rename local to avoid shadowing.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/eval.c | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 62731238903..fe7779304ad 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2011-04-03 Paul Eggert <eggert@cs.ucla.edu> + * eval.c (funcall_lambda): Rename local to avoid shadowing. + * alloc.c (mark_object_loop_halt, mark_object): Use size_t, not int. Otherwise, GCC 4.6.0 optimizes the loop check away since the check can always succeed if overflow has undefined behavior. 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, optional = 1; else { - Lisp_Object val; + Lisp_Object arg; if (rest) { - val = Flist (nargs - i, &arg_vector[i]); + arg = Flist (nargs - i, &arg_vector[i]); i = nargs; } else if (i < nargs) - val = arg_vector[i++]; + arg = arg_vector[i++]; else if (!optional) xsignal2 (Qwrong_number_of_arguments, fun, make_number (nargs)); else - val = Qnil; + arg = Qnil; /* Bind the argument. */ if (!NILP (lexenv) && SYMBOLP (next)) /* Lexically bind NEXT by adding it to the lexenv alist. */ - lexenv = Fcons (Fcons (next, val), lexenv); + lexenv = Fcons (Fcons (next, arg), lexenv); else /* Dynamically bind NEXT. */ - specbind (next, val); + specbind (next, arg); } } |