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 /module/texinfo/string-utils.scm | |
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 'module/texinfo/string-utils.scm')
-rw-r--r-- | module/texinfo/string-utils.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/module/texinfo/string-utils.scm b/module/texinfo/string-utils.scm index eff914369..767514952 100644 --- a/module/texinfo/string-utils.scm +++ b/module/texinfo/string-utils.scm @@ -160,7 +160,7 @@ characters. Any needed padding is done by character @var{chr}, which defaults to @samp{#\\space}. If @var{rchr} is provided, then the padding to the right will use it instead. See the examples below. left and @var{rchr} on the right. The default @var{width} is 80. The -default @var{lchr} and @var{rchr} is @samp{#\\space}. The string is +default @var{chr} and @var{rchr} is @samp{#\\space}. The string is never truncated. @lisp (center-string \"Richard Todd\" 24) @@ -392,7 +392,7 @@ in @code{make-text-wrapper}." (define (fill-string str . kwargs) "Wraps the text given in string @var{str} according to the parameters -provided in @var{keywds}, or the default setting if they are not +provided in @var{kwargs}, or the default setting if they are not given. Returns a single string with the wrapped text. Valid keyword arguments are discussed in @code{make-text-wrapper}." (string-join (apply string->wrapped-lines str kwargs) |