diff options
| author | Miles Bader | 2005-06-24 01:59:52 +0000 |
|---|---|---|
| committer | Miles Bader | 2005-06-24 01:59:52 +0000 |
| commit | 3f0607e49476578a260289a51a84639b1885c161 (patch) | |
| tree | 076023228279f15587ea24a5a7f9adb499ee969c /src/eval.c | |
| parent | 82cf95134905ffe09000888e86e88c9a400a4468 (diff) | |
| parent | ff71329437a5195b60799e019871181c916024ff (diff) | |
| download | emacs-3f0607e49476578a260289a51a84639b1885c161.tar.gz emacs-3f0607e49476578a260289a51a84639b1885c161.zip | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-65
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 425-445)
- Remove "-face" suffix from gnus faces
- Update from CVS
- Remove "-face" suffix from MH-E faces
- Remove "-face" suffix from cc-mode faces
- Remove "-face" suffix from eshell faces
- Remove "-face" suffix from ediff faces
- Implement tty vertical-divider face
- Rename vertical-divider face to vertical-border
- Change escape-glyph color on dark backgrounds back to cyan
- Update reference to renamed Buffer-menu-buffer face
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/eval.c b/src/eval.c index 445eb283114..8ad289fd51f 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -785,7 +785,7 @@ usage: (defvar SYMBOL &optional INITVALUE DOCSTRING) */) | |||
| 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)) |
| @@ -845,7 +845,7 @@ usage: (defconst SYMBOL INITVALUE [DOCSTRING]) */) | |||
| 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)) |
| @@ -2037,7 +2037,7 @@ DEFUN ("eval", Feval, Seval, 1, 1, 0, | |||
| 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); |
| @@ -2733,7 +2733,7 @@ usage: (funcall FUNCTION &rest ARGUMENTS) */) | |||
| 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; |