From 178f2507dc66c21b3c00fdac98cb985132dff001 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Tue, 4 May 2010 13:44:54 -0400 Subject: [PATCH] Misc tweaks. * eval.c (Fdefvaralias): Remove unintended nested if. (internal_condition_case_2, internal_condition_case_n): Use ANSI type. --- src/ChangeLog | 6 ++++++ src/eval.c | 29 ++++++++++++----------------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index c7e86efb88b..7f6b335c391 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2010-05-04 Stefan Monnier + + 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 (tiny change) * xsmfns.c (smc_save_yourself_CB): strlen(client_id) => strlen(cwd). diff --git a/src/eval.c b/src/eval.c index e1fb815719e..6d0a844a31e 100644 --- a/src/eval.c +++ b/src/eval.c @@ -770,11 +770,8 @@ The return value is BASE-VARIABLE. */) 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 @@ internal_condition_case_1 (bfun, arg, handlers, hfun) 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 @@ internal_condition_case_2 (bfun, arg1, arg2, handlers, hfun) 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; -- 2.39.2