Mercurial > emacs
comparison src/eval.c @ 108239:a2f08cd3ab5c
Misc tweaks.
* eval.c (Fdefvaralias): Remove unintended nested if.
(internal_condition_case_2, internal_condition_case_n): Use ANSI type.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Tue, 04 May 2010 13:44:54 -0400 |
| parents | 261591829d04 |
| children | ee0a08d8887e |
comparison
equal
deleted
inserted
replaced
| 108238:c86b00c650ef | 108239:a2f08cd3ab5c |
|---|---|
| 768 CHECK_SYMBOL (base_variable); | 768 CHECK_SYMBOL (base_variable); |
| 769 | 769 |
| 770 sym = XSYMBOL (new_alias); | 770 sym = XSYMBOL (new_alias); |
| 771 | 771 |
| 772 if (sym->constant) | 772 if (sym->constant) |
| 773 if (sym->redirect == SYMBOL_VARALIAS) | 773 /* Not sure why, but why not? */ |
| 774 sym->constant = 0; /* Reset. */ | 774 error ("Cannot make a constant an alias"); |
| 775 else | |
| 776 /* Not sure why. */ | |
| 777 error ("Cannot make a constant an alias"); | |
| 778 | 775 |
| 779 switch (sym->redirect) | 776 switch (sym->redirect) |
| 780 { | 777 { |
| 781 case SYMBOL_FORWARDED: | 778 case SYMBOL_FORWARDED: |
| 782 error ("Cannot make an internal variable an alias"); | 779 error ("Cannot make an internal variable an alias"); |
| 1565 | 1562 |
| 1566 /* Like internal_condition_case_1 but call BFUN with ARG1 and ARG2 as | 1563 /* Like internal_condition_case_1 but call BFUN with ARG1 and ARG2 as |
| 1567 its arguments. */ | 1564 its arguments. */ |
| 1568 | 1565 |
| 1569 Lisp_Object | 1566 Lisp_Object |
| 1570 internal_condition_case_2 (bfun, arg1, arg2, handlers, hfun) | 1567 internal_condition_case_2 (Lisp_Object (*bfun) (Lisp_Object, Lisp_Object), |
| 1571 Lisp_Object (*bfun) (); | 1568 Lisp_Object arg1, |
| 1572 Lisp_Object arg1; | 1569 Lisp_Object arg2, |
| 1573 Lisp_Object arg2; | 1570 Lisp_Object handlers, |
| 1574 Lisp_Object handlers; | 1571 Lisp_Object (*hfun) (Lisp_Object)) |
| 1575 Lisp_Object (*hfun) (); | |
| 1576 { | 1572 { |
| 1577 Lisp_Object val; | 1573 Lisp_Object val; |
| 1578 struct catchtag c; | 1574 struct catchtag c; |
| 1579 struct handler h; | 1575 struct handler h; |
| 1580 | 1576 |
| 1615 | 1611 |
| 1616 /* Like internal_condition_case but call BFUN with NARGS as first, | 1612 /* Like internal_condition_case but call BFUN with NARGS as first, |
| 1617 and ARGS as second argument. */ | 1613 and ARGS as second argument. */ |
| 1618 | 1614 |
| 1619 Lisp_Object | 1615 Lisp_Object |
| 1620 internal_condition_case_n (bfun, nargs, args, handlers, hfun) | 1616 internal_condition_case_n (Lisp_Object (*bfun) (int, Lisp_Object*), |
| 1621 Lisp_Object (*bfun) (); | 1617 int nargs, |
| 1622 int nargs; | 1618 Lisp_Object *args, |
| 1623 Lisp_Object *args; | 1619 Lisp_Object handlers, |
| 1624 Lisp_Object handlers; | 1620 Lisp_Object (*hfun) (Lisp_Object)) |
| 1625 Lisp_Object (*hfun) (); | |
| 1626 { | 1621 { |
| 1627 Lisp_Object val; | 1622 Lisp_Object val; |
| 1628 struct catchtag c; | 1623 struct catchtag c; |
| 1629 struct handler h; | 1624 struct handler h; |
| 1630 | 1625 |