diff options
author | Andy Wingo <wingo@pobox.com> | 2012-02-08 11:48:08 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2012-02-08 11:48:08 +0100 |
commit | 0858753e829fd399b55700688b4b2cb9c3ea6908 (patch) | |
tree | 55f97b3c1db7a33a181314663cb4e4750077fc3f /libguile/promises.c | |
parent | 0aed71aa51e89e714de2392c2a5f44694dca77ea (diff) | |
parent | 817307ccac5027fd784798bbbf6ffb52e0a5d751 (diff) | |
download | guile-0858753e829fd399b55700688b4b2cb9c3ea6908.tar.gz |
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts:
GUILE-VERSION
libguile/gc-malloc.c
libguile/ports.c
Diffstat (limited to 'libguile/promises.c')
-rw-r--r-- | libguile/promises.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libguile/promises.c b/libguile/promises.c index 57a208104..dcd0ac383 100644 --- a/libguile/promises.c +++ b/libguile/promises.c @@ -98,8 +98,8 @@ promise_print (SCM exp, SCM port, scm_print_state *pstate) 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 { |