[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.6-44-gb3a2259

[Mark H Weaver]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=b3a2259ce3ffeb6a33093f5d02fa04aba15c633a

The branch, stable-2.0 has been updated
       via  b3a2259ce3ffeb6a33093f5d02fa04aba15c633a (commit)
       via  495797ceb50a857a033f390b4fc35e2989bd66cd (commit)
      from  f865ffaab159e52d48b015bea7280b2940753482 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b3a2259ce3ffeb6a33093f5d02fa04aba15c633a
Author: Mark H Weaver <address@hidden>
Date:   Sat Oct 13 20:41:45 2012 -0400

    Remove prototype for scm_read_token, which does not exist.
    
    * libguile/read.h: Remove prototype for scm_read_token.

commit 495797ceb50a857a033f390b4fc35e2989bd66cd
Author: Mark H Weaver <address@hidden>
Date:   Sat Oct 13 20:28:27 2012 -0400

    Improve formatting of options help given long option names
    
    * module/ice-9/boot-9.scm (define-option-interface): When printing
      options help, e.g. for (read-options 'help), expand the width of the
      first column by another tab stop, to accommodate option names of up to
      23 characters.

-----------------------------------------------------------------------

Summary of changes:
 libguile/read.h         |    1 -
 module/ice-9/boot-9.scm |    7 +++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/libguile/read.h b/libguile/read.h
index 4bd08fa..3c47afd 100644
--- a/libguile/read.h
+++ b/libguile/read.h
@@ -54,7 +54,6 @@ SCM_API SCM scm_sym_dot;
 
 SCM_API SCM scm_read_options (SCM setting);
 SCM_API SCM scm_read (SCM port);
-SCM_API size_t scm_read_token (int ic, SCM * tok_buf, SCM port, int weird);
 SCM_API SCM scm_read_hash_extend (SCM chr, SCM proc);
 SCM_INTERNAL char *scm_i_scan_for_encoding (SCM port);
 SCM_API SCM scm_file_encoding (SCM port);
diff --git a/module/ice-9/boot-9.scm b/module/ice-9/boot-9.scm
index cf8252a..d679f6e 100644
--- a/module/ice-9/boot-9.scm
+++ b/module/ice-9/boot-9.scm
@@ -2850,8 +2850,11 @@ module '(ice-9 q) '(make-q q-length))}."
                 (lambda (option)
                   (apply (lambda (name value documentation)
                            (display name)
-                           (if (< (string-length (symbol->string name)) 8)
-                               (display #\tab))
+                           (let ((len (string-length (symbol->string name))))
+                             (when (< len 16)
+                               (display #\tab)
+                               (when (< len 8)
+                                 (display #\tab))))
                            (display #\tab)
                            (display value)
                            (display #\tab)


hooks/post-receive
-- 
GNU Guile