Import Debian changes 5e5-1debian/5e5-1

scm (5e5-1) unstable; urgency=low

  * New upstream release.
  * continue.h: Repeat change from 5e1-2.
  * xgen.scm: Repeat change from 5e2-4.
  * scm.1: Repeat change from 5e2-4.
  * build.scm: Repeat change from 5e3-5.
  * Makefile: Repeat change from 5e3-2.
  * debian/control (Build-Depends): Require at least version 3b1 of slib.
  (scm Depends): Likewise.
  (libscm-dev Depends): Likewise.
    
  * Makefile (scm.info): Add explicit dependency on features.txi and
    platform.txi.  For some reason the one through $(texifiles) is 
    failing mysteriously.  Perhaps this is a make bug.

1 files changed, 22 insertions, 39 deletions

diff --git a/eval.c b/eval.c
index 86c56a3..407efc4 100644
--- a/eval.c
+++ b/eval.c
@@ -1,46 +1,22 @@
-/* Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1997, 1998, 1999, 2002, 2006 Free Software Foundation, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this software; see the file COPYING.  If not, write to
- * the Free Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111, USA.
- *
- * As a special exception, the Free Software Foundation gives permission
- * for additional uses of the text contained in its release of SCM.
- *
- * The exception is that, if you link the SCM library with other files
- * to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the SCM library code into it.
+/* "eval.c" eval and apply.
+ * Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1997, 1998, 1999, 2002, 2006 Free Software Foundation, Inc.
  *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
  *
- * This exception applies only to the code released by the
- * Free Software Foundation under the name SCM.  If you copy
- * code from other Free Software Foundation releases into a copy of
- * SCM, as the General Public License permits, the exception does
- * not apply to the code that you add in this way.  To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * If you write modifications of your own for SCM, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
  */
 
-/* "eval.c" eval and apply.
-   Authors: Radey Shouman, Aubrey Jaffer, & Hugh E. Secker-Walker. */
+/* Authors: Radey Shouman, Aubrey Jaffer, & Hugh E. Secker-Walker. */
 
 #include "scm.h"
 #include "setjump.h"
@@ -2061,7 +2037,7 @@ SCM scm_eval_values(x, env, valenv)
   STATIC_ENV = env;
   scm_env = valenv;
   scm_env_tmp = IM_VALUES_TOKEN;
-  if (NIMP(x)) x = ceval_1(x);
+  if (NIMP(x)) x = ceval_1(cons2(IM_EVAL_VALUES, x, EOL));
   DEFER_INTS_EGC;
   if (IM_VALUES_TOKEN==scm_env_tmp) {
     if (UNBNDP(x))
@@ -2408,6 +2384,13 @@ static SCM ceval_1(x)
     case (ISYMNUM(IM_DEFINE)):
       x = toplevel_define(x, STATIC_ENV);
       goto retx;
+    case (ISYMNUM(IM_EVAL_VALUES)):
+                                /* Push magic VALUES token on estk until
+                                   tail call occurs.  Only happens when called
+                                   from scm_eval_values. */
+      ENV_MAY_PUSH(envpp);
+      scm_env_tmp = EOL;
+      goto cdrxbegin;
     /* new syntactic forms go here. */
     default:
       goto badfun;