aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman1994-01-11 19:06:40 +0000
committerRichard M. Stallman1994-01-11 19:06:40 +0000
commit4200e71976c56225d98af03f63bbe7e09c16dd92 (patch)
tree62785cfa59e9f5bfee2347598a2aba4fae73c840 /src
parent8150596afbec8ad31a93f3efd63c4b400855382c (diff)
downloademacs-4200e71976c56225d98af03f63bbe7e09c16dd92.tar.gz
emacs-4200e71976c56225d98af03f63bbe7e09c16dd92.zip
(Fsignal): Rename 1st arg to error_symbol.
Diffstat (limited to 'src')
-rw-r--r--src/eval.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/eval.c b/src/eval.c
index 5f72b7a07c2..0b52581eac6 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1094,9 +1094,9 @@ internal_condition_case (bfun, handlers, hfun)
1094static Lisp_Object find_handler_clause (); 1094static Lisp_Object find_handler_clause ();
1095 1095
1096DEFUN ("signal", Fsignal, Ssignal, 2, 2, 0, 1096DEFUN ("signal", Fsignal, Ssignal, 2, 2, 0,
1097 "Signal an error. Args are SIGNAL-NAME, and associated DATA.\n\ 1097 "Signal an error. Args are ERROR-SYMBOL and associated DATA.\n\
1098This function does not return.\n\n\ 1098This function does not return.\n\n\
1099A signal name is a symbol with an `error-conditions' property\n\ 1099An error symbol is a symbol with an `error-conditions' property\n\
1100that is a list of condition names.\n\ 1100that is a list of condition names.\n\
1101A handler for any of those names will get to handle this signal.\n\ 1101A handler for any of those names will get to handle this signal.\n\
1102The symbol `error' should normally be one of them.\n\ 1102The symbol `error' should normally be one of them.\n\
@@ -1104,8 +1104,8 @@ The symbol `error' should normally be one of them.\n\
1104DATA should be a list. Its elements are printed as part of the error message.\n\ 1104DATA should be a list. Its elements are printed as part of the error message.\n\
1105If the signal is handled, DATA is made available to the handler.\n\ 1105If the signal is handled, DATA is made available to the handler.\n\
1106See also the function `condition-case'.") 1106See also the function `condition-case'.")
1107 (sig, data) 1107 (error_symbol, data)
1108 Lisp_Object sig, data; 1108 Lisp_Object error_symbol, data;
1109{ 1109{
1110 register struct handler *allhandlers = handlerlist; 1110 register struct handler *allhandlers = handlerlist;
1111 Lisp_Object conditions; 1111 Lisp_Object conditions;
@@ -1122,13 +1122,13 @@ See also the function `condition-case'.")
1122 TOTALLY_UNBLOCK_INPUT; 1122 TOTALLY_UNBLOCK_INPUT;
1123#endif 1123#endif
1124 1124
1125 conditions = Fget (sig, Qerror_conditions); 1125 conditions = Fget (error_symbol, Qerror_conditions);
1126 1126
1127 for (; handlerlist; handlerlist = handlerlist->next) 1127 for (; handlerlist; handlerlist = handlerlist->next)
1128 { 1128 {
1129 register Lisp_Object clause; 1129 register Lisp_Object clause;
1130 clause = find_handler_clause (handlerlist->handler, conditions, 1130 clause = find_handler_clause (handlerlist->handler, conditions,
1131 sig, data, &debugger_value); 1131 error_symbol, data, &debugger_value);
1132 1132
1133#if 0 /* Most callers are not prepared to handle gc if this returns. 1133#if 0 /* Most callers are not prepared to handle gc if this returns.
1134 So, since this feature is not very useful, take it out. */ 1134 So, since this feature is not very useful, take it out. */
@@ -1141,7 +1141,7 @@ See also the function `condition-case'.")
1141 { 1141 {
1142 /* We can't return values to code which signalled an error, but we 1142 /* We can't return values to code which signalled an error, but we
1143 can continue code which has signalled a quit. */ 1143 can continue code which has signalled a quit. */
1144 if (EQ (sig, Qquit)) 1144 if (EQ (error_symbol, Qquit))
1145 return Qnil; 1145 return Qnil;
1146 else 1146 else
1147 error ("Cannot return from the debugger in an error"); 1147 error ("Cannot return from the debugger in an error");
@@ -1152,14 +1152,14 @@ See also the function `condition-case'.")
1152 { 1152 {
1153 struct handler *h = handlerlist; 1153 struct handler *h = handlerlist;
1154 handlerlist = allhandlers; 1154 handlerlist = allhandlers;
1155 unwind_to_catch (h->tag, Fcons (clause, Fcons (sig, data))); 1155 unwind_to_catch (h->tag, Fcons (clause, Fcons (error_symbol, data)));
1156 } 1156 }
1157 } 1157 }
1158 1158
1159 handlerlist = allhandlers; 1159 handlerlist = allhandlers;
1160 /* If no handler is present now, try to run the debugger, 1160 /* If no handler is present now, try to run the debugger,
1161 and if that fails, throw to top level. */ 1161 and if that fails, throw to top level. */
1162 find_handler_clause (Qerror, conditions, sig, data, &debugger_value); 1162 find_handler_clause (Qerror, conditions, error_symbol, data, &debugger_value);
1163 Fthrow (Qtop_level, Qt); 1163 Fthrow (Qtop_level, Qt);
1164} 1164}
1165 1165