[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.1-76-ga04e574

[Andy Wingo]

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=a04e57498c7d7223315e39c34cc8d5e3bf8d5e0b

The branch, stable-2.0 has been updated
       via  a04e57498c7d7223315e39c34cc8d5e3bf8d5e0b (commit)
       via  1233b38393c776d48cfc4c91d9c514ea7f3762f3 (commit)
      from  b6a66c21fc3791bb5ea50f6e7a0ccc2e8f55e27a (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 a04e57498c7d7223315e39c34cc8d5e3bf8d5e0b
Author: Andy Wingo <address@hidden>
Date:   Fri May 20 12:26:53 2011 +0200

    gen-scmconfig cross-compilation fix
    
    * libguile/Makefile.am (gen-scmconfig.$(OBJEXT)): Fix
      cross-compilation.  Thanks to Volker Grabsch for the report!

commit 1233b38393c776d48cfc4c91d9c514ea7f3762f3
Author: Andy Wingo <address@hidden>
Date:   Fri May 20 11:54:46 2011 +0200

    fix documentation for option-set! syntaxen
    
    * doc/ref/api-evaluation.texi (Scheme Read): Note that read-set! is
      syntax.
      (Scheme Write): Likewise for print-set!.
    
    * doc/ref/api-io.texi (Writing): Remove reference to
      print-options-interface.
    
    * doc/ref/repl-modules.texi (Readline Options): Update, and add entries
      for readline-options, readline-set! et al.

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

Summary of changes:
 doc/ref/api-debug.texi      |    9 ++++++---
 doc/ref/api-evaluation.texi |   14 +++++++++-----
 doc/ref/api-io.texi         |    8 --------
 doc/ref/repl-modules.texi   |   36 +++++++++++++++---------------------
 libguile/Makefile.am        |   11 ++++++++---
 5 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/doc/ref/api-debug.texi b/doc/ref/api-debug.texi
index 765b4ad..bdb6166 100644
--- a/doc/ref/api-debug.texi
+++ b/doc/ref/api-debug.texi
@@ -1,6 +1,6 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Guile Reference Manual.
address@hidden Copyright (C)  1996, 1997, 2000, 2001, 2002, 2003, 2004, 2007, 
2010
address@hidden Copyright (C)  1996, 1997, 2000, 2001, 2002, 2003, 2004, 2007, 
2010, 2011
 @c   Free Software Foundation, Inc.
 @c See the file guile.texi for copying conditions.
 
@@ -645,10 +645,13 @@ using @code{debug-set!}.
 
 @deffn {Scheme Procedure} debug-enable option-name
 @deffnx {Scheme Procedure} debug-disable option-name
address@hidden {Scheme Procedure} debug-set! option-name value
address@hidden {Scheme Syntax} debug-set! option-name value
 Modify the debug options.  @code{debug-enable} should be used with boolean
 options and switches them on, @code{debug-disable} switches them off.
address@hidden can be used to set an option to a specific value.
+
address@hidden can be used to set an option to a specific value.  Due
+to historical oddities, it is a macro that expects an unquoted option
+name.
 @end deffn
 
 @subsubheading Stack overflow
diff --git a/doc/ref/api-evaluation.texi b/doc/ref/api-evaluation.texi
index 9430c74..e873310 100644
--- a/doc/ref/api-evaluation.texi
+++ b/doc/ref/api-evaluation.texi
@@ -341,10 +341,13 @@ using @code{read-set!}.
 
 @deffn {Scheme Procedure} read-enable option-name
 @deffnx {Scheme Procedure} read-disable option-name
address@hidden {Scheme Procedure} read-set! option-name value
address@hidden {Scheme Syntax} read-set! option-name value
 Modify the read options.  @code{read-enable} should be used with boolean
 options and switches them on, @code{read-disable} switches them off.
address@hidden can be used to set an option to a specific value.
+
address@hidden can be used to set an option to a specific value.  Due
+to historical oddities, it is a macro that expects an unquoted option
+name.
 @end deffn
 
 For example, to make @code{read} fold all symbols to their lower case
@@ -416,10 +419,11 @@ quote-keywordish-symbols  reader  How to print symbols 
that have a colon
                                   not '#f'.
 @end smalllisp
 
-These options may be modified with the print-set! procedure.
+These options may be modified with the print-set! syntax.
 
address@hidden {Scheme Procedure} print-set! option-name value
-Modify the print options.
address@hidden {Scheme Syntax} print-set! option-name value
+Modify the print options.  Due to historical oddities, @code{print-set!}
+is a macro that expects an unquoted option name.
 @end deffn
 
 
diff --git a/doc/ref/api-io.texi b/doc/ref/api-io.texi
index 09fdc83..19c0665 100644
--- a/doc/ref/api-io.texi
+++ b/doc/ref/api-io.texi
@@ -336,14 +336,6 @@ If @var{pstate} isn't supplied and @var{port} already has
 a print state, the old print state is reused.
 @end deffn
 
address@hidden {Scheme Procedure} print-options-interface [setting]
address@hidden {C Function} scm_print_options (setting)
-Option interface for the print options. Instead of using
-this procedure directly, use the procedures
address@hidden, @code{print-disable}, @code{print-set!}
-and @code{print-options}.
address@hidden deffn
-
 @deffn {Scheme Procedure} simple-format destination message . args
 @deffnx {C Function} scm_simple_format (destination, message, args)
 Write @var{message} to @var{destination}, defaulting to
diff --git a/doc/ref/repl-modules.texi b/doc/ref/repl-modules.texi
index 78c7eee..7008672 100644
--- a/doc/ref/repl-modules.texi
+++ b/doc/ref/repl-modules.texi
@@ -1,6 +1,6 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Guile Reference Manual.
address@hidden Copyright (C)  1996, 1997, 2000, 2001, 2002, 2003, 2004, 2010
address@hidden Copyright (C)  1996, 1997, 2000, 2001, 2002, 2003, 2004, 2010, 
2011
 @c   Free Software Foundation, Inc.
 @c See the file guile.texi for copying conditions.
 
@@ -84,18 +84,21 @@ $endif
 @node Readline Options
 @subsection Readline Options
 
address@hidden FIXME::martin: Review me!
-
 @cindex readline options
-The readline interface module can be configured in several ways to
-better suit the user's needs.  Configuration is done via the readline
-module's options interface, in a similar way to the evaluator and
-debugging options (@pxref{Runtime Options}).
-
address@hidden readline-options
address@hidden readline-enable
address@hidden readline-disable
address@hidden readline-set!
+The readline interface module can be tweaked in a few ways to better
+suit the user's needs.  Configuration is done via the readline module's
+options interface, in a similar way to the evaluator and debugging
+options (@pxref{Runtime Options}).
+
address@hidden {Scheme Procedure} readline-options
address@hidden {Scheme Procedure} readline-enable option-name
address@hidden {Scheme Procedure} readline-disable option-name
address@hidden {Scheme Syntax} readline-set! option-name value
+Accessors for the readline options.  Note that unlike the enable/disable
+procedures, @code{readline-set!} is syntax, which expects an unquoted
+option name.
address@hidden deffn
+
 Here is the list of readline options generated by typing
 @code{(readline-options 'help)} in Guile.  You can also see the
 default values.
@@ -107,15 +110,6 @@ bounce-parens   500     Time (ms) to show matching opening 
parenthesis
                         (0 = off).
 @end smalllisp
 
-The history length specifies how many input lines will be remembered.
-If the history contains that many lines and additional lines are
-entered, the oldest lines will be lost.  You can switch on/off the
-usage of the history file using the following call.
-
address@hidden
-(readline-disable 'history)
address@hidden lisp
-
 The readline options interface can only be used @emph{after} loading
 the readline module, because it is defined in that module.
 
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 263d6b0..6f2f793 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -52,12 +52,17 @@ noinst_PROGRAMS = guile_filter_doc_snarfage gen-scmconfig
 
 gen_scmconfig_SOURCES = gen-scmconfig.c
 
-## Override default rule; this should be compiled for BUILD host.
-## For some reason, OBJEXT does not include the dot
+## Override default rule; this should be compiled for BUILD host.  Note
+## that we don't add $(AM_CPPFLAGS) here, as we need to run this
+## program, but $(top_srcdir)/lib has a gnulib configured for the
+## target.  Instead we manually add $(top_builddir), in order to pick up
+## the generated config.h and gen-scmconfig.h.  Nothing else from Guile
+## is included by this code generator.
 gen-scmconfig.$(OBJEXT): gen-scmconfig.c
        $(AM_V_GEN) \
        if [ "$(cross_compiling)" = "yes" ]; then \
-               $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) -c 
-o $@ $<; \
+               $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) -I$(top_builddir) \
+                  -c -o $@ $<; \
        else \
                $(COMPILE) -c -o $@ $<; \
        fi


hooks/post-receive
-- 
GNU Guile