Mercurial > emacs
comparison src/eval.c @ 83314:d07fdd5d7d4e
Merged from miles@gnu.org--gnu-2005 (patch 441-446)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-441
Update reference to renamed Buffer-menu-buffer face
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-442
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-443
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-444
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-445
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-446
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-354
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Sat, 25 Jun 2005 15:00:08 +0000 |
| parents | 9f617bb41e22 |
| children | 60a9b2133cf1 b7da78284d4c |
comparison
equal
deleted
inserted
replaced
| 83313:bdcbdec78dd3 | 83314:d07fdd5d7d4e |
|---|---|
| 783 register Lisp_Object sym, tem, tail; | 783 register Lisp_Object sym, tem, tail; |
| 784 | 784 |
| 785 sym = Fcar (args); | 785 sym = Fcar (args); |
| 786 tail = Fcdr (args); | 786 tail = Fcdr (args); |
| 787 if (!NILP (Fcdr (Fcdr (tail)))) | 787 if (!NILP (Fcdr (Fcdr (tail)))) |
| 788 error ("too many arguments"); | 788 error ("Too many arguments"); |
| 789 | 789 |
| 790 tem = Fdefault_boundp (sym); | 790 tem = Fdefault_boundp (sym); |
| 791 if (!NILP (tail)) | 791 if (!NILP (tail)) |
| 792 { | 792 { |
| 793 if (NILP (tem)) | 793 if (NILP (tem)) |
| 843 { | 843 { |
| 844 register Lisp_Object sym, tem; | 844 register Lisp_Object sym, tem; |
| 845 | 845 |
| 846 sym = Fcar (args); | 846 sym = Fcar (args); |
| 847 if (!NILP (Fcdr (Fcdr (Fcdr (args))))) | 847 if (!NILP (Fcdr (Fcdr (Fcdr (args))))) |
| 848 error ("too many arguments"); | 848 error ("Too many arguments"); |
| 849 | 849 |
| 850 tem = Feval (Fcar (Fcdr (args))); | 850 tem = Feval (Fcar (Fcdr (args))); |
| 851 if (!NILP (Vpurify_flag)) | 851 if (!NILP (Vpurify_flag)) |
| 852 tem = Fpurecopy (tem); | 852 tem = Fpurecopy (tem); |
| 853 Fset_default (sym, tem); | 853 Fset_default (sym, tem); |
| 2035 if (++lisp_eval_depth > max_lisp_eval_depth) | 2035 if (++lisp_eval_depth > max_lisp_eval_depth) |
| 2036 { | 2036 { |
| 2037 if (max_lisp_eval_depth < 100) | 2037 if (max_lisp_eval_depth < 100) |
| 2038 max_lisp_eval_depth = 100; | 2038 max_lisp_eval_depth = 100; |
| 2039 if (lisp_eval_depth > max_lisp_eval_depth) | 2039 if (lisp_eval_depth > max_lisp_eval_depth) |
| 2040 error ("Lisp nesting exceeds max-lisp-eval-depth"); | 2040 error ("Lisp nesting exceeds `max-lisp-eval-depth'"); |
| 2041 } | 2041 } |
| 2042 | 2042 |
| 2043 original_fun = Fcar (form); | 2043 original_fun = Fcar (form); |
| 2044 original_args = Fcdr (form); | 2044 original_args = Fcdr (form); |
| 2045 | 2045 |
| 2731 if (++lisp_eval_depth > max_lisp_eval_depth) | 2731 if (++lisp_eval_depth > max_lisp_eval_depth) |
| 2732 { | 2732 { |
| 2733 if (max_lisp_eval_depth < 100) | 2733 if (max_lisp_eval_depth < 100) |
| 2734 max_lisp_eval_depth = 100; | 2734 max_lisp_eval_depth = 100; |
| 2735 if (lisp_eval_depth > max_lisp_eval_depth) | 2735 if (lisp_eval_depth > max_lisp_eval_depth) |
| 2736 error ("Lisp nesting exceeds max-lisp-eval-depth"); | 2736 error ("Lisp nesting exceeds `max-lisp-eval-depth'"); |
| 2737 } | 2737 } |
| 2738 | 2738 |
| 2739 backtrace.next = backtrace_list; | 2739 backtrace.next = backtrace_list; |
| 2740 backtrace_list = &backtrace; | 2740 backtrace_list = &backtrace; |
| 2741 backtrace.function = &args[0]; | 2741 backtrace.function = &args[0]; |
