aboutsummaryrefslogtreecommitdiffstats
path: root/src/eval.c
diff options
context:
space:
mode:
authorPaul Eggert2011-04-05 22:19:39 -0700
committerPaul Eggert2011-04-05 22:19:39 -0700
commit41cf7d1aec986e1b92ca14231ac4ec242c233d45 (patch)
tree7360e455dc2e0043a31fda1d29cc6323aa213104 /src/eval.c
parent1e3cdd8228651f226beb6ac75453968a6c64feff (diff)
parentb69769da408705e40929b793d79d3bfe6a3a5a48 (diff)
downloademacs-41cf7d1aec986e1b92ca14231ac4ec242c233d45.tar.gz
emacs-41cf7d1aec986e1b92ca14231ac4ec242c233d45.zip
Fix more problems found by GCC 4.6.0's static checks.
Diffstat (limited to 'src/eval.c')
-rw-r--r--src/eval.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/eval.c b/src/eval.c
index 9b6605eed2e..93da7799bec 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1757,7 +1757,7 @@ See also the function `condition-case'. */)
1757 data = Fcons (error_symbol, data); 1757 data = Fcons (error_symbol, data);
1758 1758
1759 string = Ferror_message_string (data); 1759 string = Ferror_message_string (data);
1760 fatal ("%s", SDATA (string), 0); 1760 fatal ("%s", SDATA (string));
1761} 1761}
1762 1762
1763/* Internal version of Fsignal that never returns. 1763/* Internal version of Fsignal that never returns.
@@ -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