Merge remote-tracking branch 'origin/stable-2.0'

Conflicts:
	libguile/__scm.h
	libguile/array-map.c
	libguile/procprop.c
	libguile/tags.h
	module/ice-9/deprecated.scm
	module/ice-9/psyntax-pp.scm
	module/ice-9/psyntax.scm
	test-suite/standalone/test-num2integral.c
	test-suite/tests/regexp.test

1 files changed, 13 insertions, 0 deletions

diff --git a/libguile/backtrace.c b/libguile/backtrace.c
index 351e600a1..11a0cb1ee 100644
--- a/libguile/backtrace.c
+++ b/libguile/backtrace.c
@@ -144,6 +144,19 @@ SCM_DEFINE (scm_display_error, "display-error", 6, 0, 0,
 {
   SCM_VALIDATE_OUTPUT_PORT (2, port);
 
+#if SCM_ENABLE_DEPRECATED
+  if (SCM_STACKP (frame))
+    {
+      scm_c_issue_deprecation_warning
+        ("Passing a stack as the first argument to `scm_display_error' is "
+         "deprecated.  Pass a frame instead.");
+      if (SCM_STACK_LENGTH (frame))
+        frame = scm_stack_ref (frame, SCM_INUM0);
+      else
+        frame = SCM_BOOL_F;
+    }
+#endif
+
   scm_i_display_error (frame, port, subr, message, args, rest);
 
   return SCM_UNSPECIFIED;