[Guile-commits] GNU Guile branch, master, updated. release_1-9-14-100-g1cc0b6a

[Andy Wingo]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=1cc0b6addee57984524d23abc86f9930222bc0e5

The branch, master has been updated
       via  1cc0b6addee57984524d23abc86f9930222bc0e5 (commit)
      from  c52f77ef4efa46db88bd03fc7f2f439616635f3d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1cc0b6addee57984524d23abc86f9930222bc0e5
Author: Andy Wingo <address@hidden>
Date:   Wed Jan 26 21:44:12 2011 +0100

    fix error-handling of apply to non-list
    
    * libguile/vm-engine.c (vm_error_apply_to_non_list): Sync registers
      before erroring. Fix type of finish_args.  Thanks to Hans Aberg for
      the report.

-----------------------------------------------------------------------

Summary of changes:
 THANKS               |    1 +
 libguile/vm-engine.c |    5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/THANKS b/THANKS
index 96b9ead..607d801 100644
--- a/THANKS
+++ b/THANKS
@@ -21,6 +21,7 @@ Contributors since the last release:
 
 For fixes or providing information which led to a fix:
 
+           Hans Aberg
           David Allouche
          Andrew Bagdanov
         Martin Baulig
diff --git a/libguile/vm-engine.c b/libguile/vm-engine.c
index e69167f..341dbc8 100644
--- a/libguile/vm-engine.c
+++ b/libguile/vm-engine.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001, 2009, 2010 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2009, 2010, 2011 Free Software Foundation, Inc.
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -154,8 +154,9 @@ VM_NAME (SCM vm, SCM program, SCM *argv, int nargs)
     goto vm_error;
 
   vm_error_apply_to_non_list:
+    SYNC_ALL ();
     scm_error (scm_arg_type_key, "apply", "Apply to non-list: ~S",
-               finish_args, finish_args);
+               scm_list_1 (finish_args), scm_list_1 (finish_args));
     goto vm_error;
 
   vm_error_kwargs_length_not_even:


hooks/post-receive
-- 
GNU Guile