Mercurial > emacs
comparison src/eval.c @ 83284:360860a0006f
Merged from miles@gnu.org--gnu-2005 (patch 45-55, 214-231)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-214
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-215
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-216
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-217
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-218
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-219
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-221
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-222
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-223
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-224
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-225
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-226
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-227
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-228
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-229
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-230
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-231
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-45
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-46
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-47
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-48
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-49
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-50
Update from CVS: texi Makefile.in CVS keyw cruft
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-51
Update from CVS: ChangeLog tweaks
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-52
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-53
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-54
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-55
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-324
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Mon, 04 Apr 2005 16:43:15 +0000 |
parents | 4c111b6f6378 |
children | 787052160d87 02f1dbc4a199 |
comparison
equal
deleted
inserted
replaced
83283:45e5f0224d81 | 83284:360860a0006f |
---|---|
2740 backtrace.debug_on_exit = 0; | 2740 backtrace.debug_on_exit = 0; |
2741 | 2741 |
2742 if (debug_on_next_call) | 2742 if (debug_on_next_call) |
2743 do_debug_on_call (Qlambda); | 2743 do_debug_on_call (Qlambda); |
2744 | 2744 |
2745 CHECK_CONS_LIST (); | |
2746 | |
2745 retry: | 2747 retry: |
2746 | 2748 |
2747 fun = args[0]; | 2749 fun = args[0]; |
2748 | 2750 |
2749 fun = Findirect_function (fun); | 2751 fun = Findirect_function (fun); |
2750 | 2752 |
2751 if (SUBRP (fun)) | 2753 if (SUBRP (fun)) |
2752 { | 2754 { |
2753 CHECK_CONS_LIST (); | 2755 if (numargs < XSUBR (fun)->min_args |
2754 | |
2755 if (numargs < XSUBR (fun)->min_args | |
2756 || (XSUBR (fun)->max_args >= 0 && XSUBR (fun)->max_args < numargs)) | 2756 || (XSUBR (fun)->max_args >= 0 && XSUBR (fun)->max_args < numargs)) |
2757 { | 2757 { |
2758 XSETFASTINT (lisp_numargs, numargs); | 2758 XSETFASTINT (lisp_numargs, numargs); |
2759 return Fsignal (Qwrong_number_of_arguments, Fcons (fun, Fcons (lisp_numargs, Qnil))); | 2759 return Fsignal (Qwrong_number_of_arguments, Fcons (fun, Fcons (lisp_numargs, Qnil))); |
2760 } | 2760 } |
2842 if (EQ (funcar, Qlambda)) | 2842 if (EQ (funcar, Qlambda)) |
2843 val = funcall_lambda (fun, numargs, args + 1); | 2843 val = funcall_lambda (fun, numargs, args + 1); |
2844 else if (EQ (funcar, Qautoload)) | 2844 else if (EQ (funcar, Qautoload)) |
2845 { | 2845 { |
2846 do_autoload (fun, args[0]); | 2846 do_autoload (fun, args[0]); |
2847 CHECK_CONS_LIST (); | |
2847 goto retry; | 2848 goto retry; |
2848 } | 2849 } |
2849 else | 2850 else |
2850 return Fsignal (Qinvalid_function, Fcons (fun, Qnil)); | 2851 return Fsignal (Qinvalid_function, Fcons (fun, Qnil)); |
2851 } | 2852 } |