diff options
| author | Gerd Moellmann | 2001-10-11 09:04:09 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2001-10-11 09:04:09 +0000 |
| commit | 13d95cc02b68115f94f8c2128f578b5b2f28e637 (patch) | |
| tree | ab4de7afcd15ecf22450c6eeed7ab44abbea5958 /src | |
| parent | 7436b0a99dcc7f727aefc9d5615146cec6f7be46 (diff) | |
| download | emacs-13d95cc02b68115f94f8c2128f578b5b2f28e637.tar.gz emacs-13d95cc02b68115f94f8c2128f578b5b2f28e637.zip | |
(Qcircular_list): New variable.
(circular_list_error): New function.
(syms_of_data): Initialize it Qcircular_list.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 8 | ||||
| -rw-r--r-- | src/data.c | 18 |
2 files changed, 25 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 0aaecebaf76..33da6a999e0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | 2001-10-11 Gerd Moellmann <gerd@gnu.org> | ||
| 2 | |||
| 3 | * lisp.h (circular_list_error): Add prototype. | ||
| 4 | |||
| 5 | * data.c (Qcircular_list): New variable. | ||
| 6 | (circular_list_error): New function. | ||
| 7 | (syms_of_data): Initialize it Qcircular_list. | ||
| 8 | |||
| 1 | 2001-10-10 Stefan Monnier <monnier@cs.yale.edu> | 9 | 2001-10-10 Stefan Monnier <monnier@cs.yale.edu> |
| 2 | 10 | ||
| 3 | * window.c, syntax.c, macros.c, frame.c, emacs.c, cmds.c, category.c, | 11 | * window.c, syntax.c, macros.c, frame.c, emacs.c, cmds.c, category.c, |
diff --git a/src/data.c b/src/data.c index 527edc4ec35..ad39e82a057 100644 --- a/src/data.c +++ b/src/data.c | |||
| @@ -65,7 +65,7 @@ Lisp_Object Qnil, Qt, Qquote, Qlambda, Qsubr, Qunbound; | |||
| 65 | Lisp_Object Qerror_conditions, Qerror_message, Qtop_level; | 65 | Lisp_Object Qerror_conditions, Qerror_message, Qtop_level; |
| 66 | Lisp_Object Qerror, Qquit, Qwrong_type_argument, Qargs_out_of_range; | 66 | Lisp_Object Qerror, Qquit, Qwrong_type_argument, Qargs_out_of_range; |
| 67 | Lisp_Object Qvoid_variable, Qvoid_function, Qcyclic_function_indirection; | 67 | Lisp_Object Qvoid_variable, Qvoid_function, Qcyclic_function_indirection; |
| 68 | Lisp_Object Qcyclic_variable_indirection; | 68 | Lisp_Object Qcyclic_variable_indirection, Qcircular_list; |
| 69 | Lisp_Object Qsetting_constant, Qinvalid_read_syntax; | 69 | Lisp_Object Qsetting_constant, Qinvalid_read_syntax; |
| 70 | Lisp_Object Qinvalid_function, Qwrong_number_of_arguments, Qno_catch; | 70 | Lisp_Object Qinvalid_function, Qwrong_number_of_arguments, Qno_catch; |
| 71 | Lisp_Object Qend_of_file, Qarith_error, Qmark_inactive; | 71 | Lisp_Object Qend_of_file, Qarith_error, Qmark_inactive; |
| @@ -98,6 +98,15 @@ static Lisp_Object swap_in_symval_forwarding P_ ((Lisp_Object, Lisp_Object)); | |||
| 98 | 98 | ||
| 99 | int most_positive_fixnum, most_negative_fixnum; | 99 | int most_positive_fixnum, most_negative_fixnum; |
| 100 | 100 | ||
| 101 | |||
| 102 | void | ||
| 103 | circular_list_error (list) | ||
| 104 | Lisp_Object list; | ||
| 105 | { | ||
| 106 | Fsignal (Qcircular_list, list); | ||
| 107 | } | ||
| 108 | |||
| 109 | |||
| 101 | Lisp_Object | 110 | Lisp_Object |
| 102 | wrong_type_argument (predicate, value) | 111 | wrong_type_argument (predicate, value) |
| 103 | register Lisp_Object predicate, value; | 112 | register Lisp_Object predicate, value; |
| @@ -2881,6 +2890,13 @@ syms_of_data () | |||
| 2881 | Fput (Qcyclic_variable_indirection, Qerror_message, | 2890 | Fput (Qcyclic_variable_indirection, Qerror_message, |
| 2882 | build_string ("Symbol's chain of variable indirections contains a loop")); | 2891 | build_string ("Symbol's chain of variable indirections contains a loop")); |
| 2883 | 2892 | ||
| 2893 | Qcircular_list = intern ("circular-list"); | ||
| 2894 | staticpro (&Qcircular_list); | ||
| 2895 | Fput (Qcircular_list, Qerror_conditions, | ||
| 2896 | Fcons (Qcircular_list, error_tail)); | ||
| 2897 | Fput (Qcircular_list, Qerror_message, | ||
| 2898 | build_string ("List contains a loop")); | ||
| 2899 | |||
| 2884 | Fput (Qvoid_variable, Qerror_conditions, | 2900 | Fput (Qvoid_variable, Qerror_conditions, |
| 2885 | Fcons (Qvoid_variable, error_tail)); | 2901 | Fcons (Qvoid_variable, error_tail)); |
| 2886 | Fput (Qvoid_variable, Qerror_message, | 2902 | Fput (Qvoid_variable, Qerror_message, |