mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-04 11:00:45 -08:00
Merged from emacs@sv.gnu.org
Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-351 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-352 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-353 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-354 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-355 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-356 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-357 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-358 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-359 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-360 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-361 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-362 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-363 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-364 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-365 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-366 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-367 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-368 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-369 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-370 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-115 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-116 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-117 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-118 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-119 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-120 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-573
This commit is contained in:
Karoly Lorentey
commit
251bc578cc
189 changed files with 9111 additions and 3493 deletions
64
src/data.c
64
src/data.c
|
|
@ -106,7 +106,7 @@ void
|
|||
circular_list_error (list)
|
||||
Lisp_Object list;
|
||||
{
|
||||
Fsignal (Qcircular_list, list);
|
||||
xsignal (Qcircular_list, list);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -119,16 +119,7 @@ wrong_type_argument (predicate, value)
|
|||
if ((unsigned int) XGCTYPE (value) >= Lisp_Type_Limit)
|
||||
abort ();
|
||||
|
||||
Fsignal (Qwrong_type_argument, list2 (predicate, value));
|
||||
|
||||
/* This function is marked as NO_RETURN, gcc would warn if it has a
|
||||
return statement or if falls off the function. Other compilers
|
||||
warn if no return statement is present. */
|
||||
#ifndef __GNUC__
|
||||
return value;
|
||||
#else
|
||||
abort ();
|
||||
#endif
|
||||
xsignal2 (Qwrong_type_argument, predicate, value);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -141,16 +132,14 @@ void
|
|||
args_out_of_range (a1, a2)
|
||||
Lisp_Object a1, a2;
|
||||
{
|
||||
while (1)
|
||||
Fsignal (Qargs_out_of_range, Fcons (a1, Fcons (a2, Qnil)));
|
||||
xsignal2 (Qargs_out_of_range, a1, a2);
|
||||
}
|
||||
|
||||
void
|
||||
args_out_of_range_3 (a1, a2, a3)
|
||||
Lisp_Object a1, a2, a3;
|
||||
{
|
||||
while (1)
|
||||
Fsignal (Qargs_out_of_range, Fcons (a1, Fcons (a2, Fcons (a3, Qnil))));
|
||||
xsignal3 (Qargs_out_of_range, a1, a2, a3);
|
||||
}
|
||||
|
||||
/* On some machines, XINT needs a temporary location.
|
||||
|
|
@ -619,7 +608,7 @@ Return SYMBOL. */)
|
|||
{
|
||||
CHECK_SYMBOL (symbol);
|
||||
if (XSYMBOL (symbol)->constant)
|
||||
return Fsignal (Qsetting_constant, Fcons (symbol, Qnil));
|
||||
xsignal1 (Qsetting_constant, symbol);
|
||||
Fset (symbol, Qunbound);
|
||||
return symbol;
|
||||
}
|
||||
|
|
@ -632,7 +621,7 @@ Return SYMBOL. */)
|
|||
{
|
||||
CHECK_SYMBOL (symbol);
|
||||
if (NILP (symbol) || EQ (symbol, Qt))
|
||||
return Fsignal (Qsetting_constant, Fcons (symbol, Qnil));
|
||||
xsignal1 (Qsetting_constant, symbol);
|
||||
XSYMBOL (symbol)->function = Qunbound;
|
||||
return symbol;
|
||||
}
|
||||
|
|
@ -643,9 +632,9 @@ DEFUN ("symbol-function", Fsymbol_function, Ssymbol_function, 1, 1, 0,
|
|||
register Lisp_Object symbol;
|
||||
{
|
||||
CHECK_SYMBOL (symbol);
|
||||
if (EQ (XSYMBOL (symbol)->function, Qunbound))
|
||||
return Fsignal (Qvoid_function, Fcons (symbol, Qnil));
|
||||
return XSYMBOL (symbol)->function;
|
||||
if (!EQ (XSYMBOL (symbol)->function, Qunbound))
|
||||
return XSYMBOL (symbol)->function;
|
||||
xsignal1 (Qvoid_function, symbol);
|
||||
}
|
||||
|
||||
DEFUN ("symbol-plist", Fsymbol_plist, Ssymbol_plist, 1, 1, 0,
|
||||
|
|
@ -676,7 +665,7 @@ DEFUN ("fset", Ffset, Sfset, 2, 2, 0,
|
|||
{
|
||||
CHECK_SYMBOL (symbol);
|
||||
if (NILP (symbol) || EQ (symbol, Qt))
|
||||
return Fsignal (Qsetting_constant, Fcons (symbol, Qnil));
|
||||
xsignal1 (Qsetting_constant, symbol);
|
||||
if (!NILP (Vautoload_queue) && !EQ (XSYMBOL (symbol)->function, Qunbound))
|
||||
Vautoload_queue = Fcons (Fcons (symbol, XSYMBOL (symbol)->function),
|
||||
Vautoload_queue);
|
||||
|
|
@ -818,7 +807,7 @@ indirect_variable (symbol)
|
|||
tortoise = XSYMBOL (tortoise)->value;
|
||||
|
||||
if (EQ (hare, tortoise))
|
||||
Fsignal (Qcyclic_variable_indirection, Fcons (symbol, Qnil));
|
||||
xsignal1 (Qcyclic_variable_indirection, symbol);
|
||||
}
|
||||
|
||||
return hare;
|
||||
|
|
@ -1130,10 +1119,10 @@ DEFUN ("symbol-value", Fsymbol_value, Ssymbol_value, 1, 1, 0,
|
|||
Lisp_Object val;
|
||||
|
||||
val = find_symbol_value (symbol);
|
||||
if (EQ (val, Qunbound))
|
||||
return Fsignal (Qvoid_variable, Fcons (symbol, Qnil));
|
||||
else
|
||||
if (!EQ (val, Qunbound))
|
||||
return val;
|
||||
|
||||
xsignal1 (Qvoid_variable, symbol);
|
||||
}
|
||||
|
||||
DEFUN ("set", Fset, Sset, 2, 2, 0,
|
||||
|
|
@ -1197,7 +1186,7 @@ set_internal (symbol, newval, buf, bindflag)
|
|||
if (SYMBOL_CONSTANT_P (symbol)
|
||||
&& (NILP (Fkeywordp (symbol))
|
||||
|| !EQ (newval, SYMBOL_VALUE (symbol))))
|
||||
return Fsignal (Qsetting_constant, Fcons (symbol, Qnil));
|
||||
xsignal1 (Qsetting_constant, symbol);
|
||||
|
||||
innercontents = valcontents = SYMBOL_VALUE (symbol);
|
||||
|
||||
|
|
@ -1391,9 +1380,10 @@ local bindings in certain buffers. */)
|
|||
register Lisp_Object value;
|
||||
|
||||
value = default_value (symbol);
|
||||
if (EQ (value, Qunbound))
|
||||
return Fsignal (Qvoid_variable, Fcons (symbol, Qnil));
|
||||
return value;
|
||||
if (!EQ (value, Qunbound))
|
||||
return value;
|
||||
|
||||
xsignal1 (Qvoid_variable, symbol);
|
||||
}
|
||||
|
||||
DEFUN ("set-default", Fset_default, Sset_default, 2, 2, 0,
|
||||
|
|
@ -1950,7 +1940,7 @@ indirect_function (object)
|
|||
tortoise = XSYMBOL (tortoise)->function;
|
||||
|
||||
if (EQ (hare, tortoise))
|
||||
Fsignal (Qcyclic_function_indirection, Fcons (object, Qnil));
|
||||
xsignal1 (Qcyclic_function_indirection, object);
|
||||
}
|
||||
|
||||
return hare;
|
||||
|
|
@ -1979,7 +1969,7 @@ function chain of symbols. */)
|
|||
return result;
|
||||
|
||||
if (NILP (noerror))
|
||||
Fsignal (Qvoid_function, Fcons (object, Qnil));
|
||||
xsignal1 (Qvoid_function, object);
|
||||
|
||||
return Qnil;
|
||||
}
|
||||
|
|
@ -2519,7 +2509,7 @@ If the base used is not 10, floating point is not recognized. */)
|
|||
CHECK_NUMBER (base);
|
||||
b = XINT (base);
|
||||
if (b < 2 || b > 16)
|
||||
Fsignal (Qargs_out_of_range, Fcons (base, Qnil));
|
||||
xsignal1 (Qargs_out_of_range, base);
|
||||
}
|
||||
|
||||
/* Skip any whitespace at the front of the number. Some versions of
|
||||
|
|
@ -2631,7 +2621,7 @@ arith_driver (code, nargs, args)
|
|||
else
|
||||
{
|
||||
if (next == 0)
|
||||
Fsignal (Qarith_error, Qnil);
|
||||
xsignal0 (Qarith_error);
|
||||
accum /= next;
|
||||
}
|
||||
break;
|
||||
|
|
@ -2704,7 +2694,7 @@ float_arith_driver (accum, argnum, code, nargs, args)
|
|||
else
|
||||
{
|
||||
if (! IEEE_FLOATING_POINT && next == 0)
|
||||
Fsignal (Qarith_error, Qnil);
|
||||
xsignal0 (Qarith_error);
|
||||
accum /= next;
|
||||
}
|
||||
break;
|
||||
|
|
@ -2786,7 +2776,7 @@ Both must be integers or markers. */)
|
|||
CHECK_NUMBER_COERCE_MARKER (y);
|
||||
|
||||
if (XFASTINT (y) == 0)
|
||||
Fsignal (Qarith_error, Qnil);
|
||||
xsignal0 (Qarith_error);
|
||||
|
||||
XSETINT (val, XINT (x) % XINT (y));
|
||||
return val;
|
||||
|
|
@ -2835,7 +2825,7 @@ Both X and Y must be numbers or markers. */)
|
|||
i2 = XINT (y);
|
||||
|
||||
if (i2 == 0)
|
||||
Fsignal (Qarith_error, Qnil);
|
||||
xsignal0 (Qarith_error);
|
||||
|
||||
i1 %= i2;
|
||||
|
||||
|
|
@ -3443,7 +3433,7 @@ arith_error (signo)
|
|||
#endif /* not BSD4_1 */
|
||||
|
||||
SIGNAL_THREAD_CHECK (signo);
|
||||
Fsignal (Qarith_error, Qnil);
|
||||
xsignal0 (Qarith_error);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue