diff -ur gwave-code-249-trunk.orig/src/scwm_guile.c gwave-code-249-trunk/src/scwm_guile.c --- gwave-code-249-trunk.orig/src/scwm_guile.c 2016-08-12 16:55:04.598733712 -0600 +++ gwave-code-249-trunk/src/scwm_guile.c 2016-08-12 16:55:43.508392247 -0600 @@ -328,41 +328,6 @@ SCM port = scm_current_error_port(); #endif - /* GJB:FIXME:MS: is this a guile compatibility test that can be dropped - now? */ - if (scm_ilength (throw_args) >= 3) - { - SCM fl; - fl = SCM_VARIABLE_REF (scm_the_last_stack_fluid_var); - - /* GJB:FIXME:MS: This is a horrible hack, - but DEREF_LAST_STACK macro was throwing a wrong type - argument at weird times, and I'm trying to avoid - a crash when I demo to RMS tomorrow, hence this - ugly hack --04/27/99 gjb */ - if (SCM_NIMP (fl) && SCM_FLUIDP (fl)) { - SCM stack = DEREF_LAST_STACK; - SCM subr = SCM_CAR (throw_args); - SCM message = SCM_CADR (throw_args); - SCM args = SCM_CADDR (throw_args); - - scm_newline(port); - scm_display_backtrace (stack, port, SCM_UNDEFINED, SCM_UNDEFINED); - scm_newline(port); - scm_display_error (stack, port, subr, message, args, SCM_EOL); - } else { -/* scwm_msg(ERR,"scwm_handle_error","scm_the_last_stack_fluid not holding a fluid!"); */ - } - } - else - { - scm_puts ("uncaught throw to ", port); - scm_prin1 (tag, port, 0); - scm_puts (": ", port); - scm_prin1 (throw_args, port, 1); - scm_putc ('\n', port); - exit (2); - } /* GJB:FIXME:MS: can the scheme code display a backtrace without the stack argument? */ return scwm_run_hook_message_only(error_hook, scm_cons(tag, throw_args));