Misc tweaks.

* eval.c (Fdefvaralias): Remove unintended nested if.
(internal_condition_case_2, internal_condition_case_n): Use ANSI type.

diff --git a/src/ChangeLog b/src/ChangeLog
index c7e86efb88bc91463a2974ff1d9cc0629493873d..7f6b335c391f5321f3dafddebcdd6866ea98cad4 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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).

diff --git a/src/eval.c b/src/eval.c
index e1fb815719e42daf3bcfcce0c013e02aa9256c5d..6d0a844a31ee1b5972d5f96c42b551a11e4543f8 100644 (file)
--- 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;