Mercurial > emacs
changeset 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 | c86b00c650ef |
| children | 9151b76191e1 |
| files | src/ChangeLog src/eval.c |
| diffstat | 2 files changed, 18 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue May 04 09:53:59 2010 -0700 +++ b/src/ChangeLog Tue May 04 13:44:54 2010 -0400 @@ -1,3 +1,9 @@ +2010-05-04 Stefan Monnier <monnier@iro.umontreal.ca> + + Misc tweaks. + * eval.c (Fdefvaralias): Remove unintended nested if. + (internal_condition_case_2, internal_condition_case_n): Use ANSI type. + 2010-05-04 Bernhard Herzog <bh@intevation.de> (tiny change) * xsmfns.c (smc_save_yourself_CB): strlen(client_id) => strlen(cwd).
--- a/src/eval.c Tue May 04 09:53:59 2010 -0700 +++ b/src/eval.c Tue May 04 13:44:54 2010 -0400 @@ -770,11 +770,8 @@ sym = XSYMBOL (new_alias); if (sym->constant) - if (sym->redirect == SYMBOL_VARALIAS) - sym->constant = 0; /* Reset. */ - else - /* Not sure why. */ - error ("Cannot make a constant an alias"); + /* Not sure why, but why not? */ + error ("Cannot make a constant an alias"); switch (sym->redirect) { @@ -1567,12 +1564,11 @@ its arguments. */ Lisp_Object -internal_condition_case_2 (bfun, arg1, arg2, handlers, hfun) - Lisp_Object (*bfun) (); - Lisp_Object arg1; - Lisp_Object arg2; - Lisp_Object handlers; - Lisp_Object (*hfun) (); +internal_condition_case_2 (Lisp_Object (*bfun) (Lisp_Object, Lisp_Object), + Lisp_Object arg1, + Lisp_Object arg2, + Lisp_Object handlers, + Lisp_Object (*hfun) (Lisp_Object)) { Lisp_Object val; struct catchtag c; @@ -1617,12 +1613,11 @@ and ARGS as second argument. */ Lisp_Object -internal_condition_case_n (bfun, nargs, args, handlers, hfun) - Lisp_Object (*bfun) (); - int nargs; - Lisp_Object *args; - Lisp_Object handlers; - Lisp_Object (*hfun) (); +internal_condition_case_n (Lisp_Object (*bfun) (int, Lisp_Object*), + int nargs, + Lisp_Object *args, + Lisp_Object handlers, + Lisp_Object (*hfun) (Lisp_Object)) { Lisp_Object val; struct catchtag c;