summaryrefslogtreecommitdiff
path: root/libguile/srfi-60.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2012-01-10 00:41:42 +0100
committerAndy Wingo <wingo@pobox.com>2012-01-10 00:41:42 +0100
commit91ee7515da0bad91330ce5c87b250d6cf12a2789 (patch)
treece023c92c0d9bf895c1265b107b270c35ba59b94 /libguile/srfi-60.c
parent0bdd43515eb3c62839512181cf33e5aea383e661 (diff)
parent0e947e1d14597651c5762a4209225c472bdaef45 (diff)
downloadguile-91ee7515da0bad91330ce5c87b250d6cf12a2789.tar.gz
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
Diffstat (limited to 'libguile/srfi-60.c')
-rw-r--r--libguile/srfi-60.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libguile/srfi-60.c b/libguile/srfi-60.c
index 264f4cbd5..1ed3c9e81 100644
--- a/libguile/srfi-60.c
+++ b/libguile/srfi-60.c
@@ -70,7 +70,7 @@ SCM_DEFINE (scm_srfi60_log2_binary_factors, "log2-binary-factors", 1, 0, 0,
SCM_DEFINE (scm_srfi60_copy_bit, "copy-bit", 3, 0, 0,
- (SCM index, SCM n, SCM bit),
+ (SCM index, SCM n, SCM newbit),
"Return @var{n} with the bit at @var{index} set according to\n"
"@var{newbit}. @var{newbit} should be @code{#t} to set the bit\n"
"to 1, or @code{#f} to set it to 0. Bits other than at\n"
@@ -86,7 +86,7 @@ SCM_DEFINE (scm_srfi60_copy_bit, "copy-bit", 3, 0, 0,
int bb;
ii = scm_to_ulong (index);
- bb = scm_to_bool (bit);
+ bb = scm_to_bool (newbit);
if (SCM_I_INUMP (n))
{