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

[bpt/guile.git] / libguile / promises.c

diff --git a/libguile/promises.c b/libguile/promises.c
index 4aff150..dcd0ac3 100644 (file)
--- a/libguile/promises.c
+++ b/libguile/promises.c
@@ -88,18 +88,18 @@ static int
 promise_print (SCM exp, SCM port, scm_print_state *pstate)
 {
   int writingp = SCM_WRITINGP (pstate);
-  scm_puts ("#<promise ", port);
+  scm_puts_unlocked ("#<promise ", port);
   SCM_SET_WRITINGP (pstate, 1);
   scm_iprin1 (SCM_PROMISE_DATA (exp), port, pstate);
   SCM_SET_WRITINGP (pstate, writingp);
-  scm_putc ('>', port);
+  scm_putc_unlocked ('>', port);
   return !0;
 }
 
 SCM_DEFINE (scm_force, "force", 1, 0, 0, 
            (SCM promise),
-           "If the promise @var{x} has not been computed yet, compute and\n"
-           "return @var{x}, otherwise just return the previously computed\n"
+           "If @var{promise} has not been computed yet, compute and\n"
+           "return @var{promise}, otherwise just return the previously computed\n"
            "value.")
 #define FUNC_NAME s_scm_force
 {