X-Git-Url: http://git.hcoop.net/bpt/guile.git/blobdiff_plain/c8b7b0dad33d6221682c5f49b7635d8de7e15bab..d8d9a8da05ec876acba81a559798eb5eeceb5a17:/libguile/backtrace.c

diff --git a/libguile/backtrace.c b/libguile/backtrace.c
index e247aa7af..0c0f11007 100644
--- a/libguile/backtrace.c
+++ b/libguile/backtrace.c
@@ -1,5 +1,6 @@
 /* Printing of backtraces and error messages
- * Copyright (C) 1996,1997,1998,1999,2000,2001, 2003, 2004, 2006, 2009, 2010, 2011 Free Software Foundation
+ * Copyright (C) 1996,1997,1998,1999,2000,2001, 2003, 2004, 2006, 2009,
+ *   2010, 2011, 2014 Free Software Foundation
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -26,9 +27,7 @@
 
 #include "libguile/_scm.h"
 
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif
 #ifdef HAVE_IO_H
 #include <io.h>
 #endif
@@ -262,14 +261,7 @@ display_frame_expr (char *hdr, SCM exp, char *tlr, int indentation, SCM sport, S
 static void
 display_application (SCM frame, int indentation, SCM sport, SCM port, scm_print_state *pstate)
 {
-  SCM proc = scm_frame_procedure (frame);
-  SCM name = (scm_is_true (scm_procedure_p (proc))
-	      ? scm_procedure_name (proc)
-	      : SCM_BOOL_F);
-  display_frame_expr ("[",
-		      scm_cons (scm_is_true (name) ? name : proc,
-				scm_frame_arguments (frame)),
-		      "]",
+  display_frame_expr ("[", scm_frame_call_representation (frame), "]",
 		      indentation,
 		      sport,
 		      port,