[Guile-commits] GNU Guile branch, master, updated. release_1-9-11-177-g2f26a22

[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=2f26a2266a3354606167a7f01df031bca8d727e9

The branch, master has been updated
       via  2f26a2266a3354606167a7f01df031bca8d727e9 (commit)
       via  dbb39d9c8ba006d419eb87cf3a92bd2b078808f9 (commit)
      from  bd2057ff19943a9768170bcb323cdaef00480af3 (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 2f26a2266a3354606167a7f01df031bca8d727e9
Author: Andy Wingo <address@hidden>
Date:   Tue Jul 13 10:42:42 2010 +0200

    ctrl-d with readline exits one recursive repl instance
    
    * module/ice-9/buffered-input.scm (make-buffered-input-port): Instead of
      always returning EOF once EOF is seen once, call the producer again.
      Allows Ctrl-D to cause one EOF at the REPL, returning once from a
      recursive edit, but input continues normally. Thanks to Andrew
      Bagdanov for a clue that led to the fix.

commit dbb39d9c8ba006d419eb87cf3a92bd2b078808f9
Author: Andy Wingo <address@hidden>
Date:   Tue Jul 13 10:40:18 2010 +0200

    don't automatically generate psyntax-pp.scm any more
    
    * module/Makefile.am (ice-9/psyntax-pp.scm.gen): No longer automatically
      regenerate psyntax-pp.scm, as the gensym dance is getting too
      complicated. Instead when you change psyntax.scm now you should make
      ice-9/psyntax-pp.scm.gen.

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

Summary of changes:
 THANKS                          |    1 +
 module/Makefile.am              |    4 ++--
 module/ice-9/buffered-input.scm |    5 ++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/THANKS b/THANKS
index 403ff97..9e18e59 100644
--- a/THANKS
+++ b/THANKS
@@ -21,6 +21,7 @@ Contributors since the last release:
 For fixes or providing information which led to a fix:
 
           David Allouche
+         Andrew Bagdanov
         Martin Baulig
         Fabrice Bauzac
         Sylvain Beucler
diff --git a/module/Makefile.am b/module/Makefile.am
index d2ab2ae..93ffa62 100644
--- a/module/Makefile.am
+++ b/module/Makefile.am
@@ -73,16 +73,16 @@ EXTRA_DIST +=                                       \
   ice-9/ChangeLog-2008
 
 include $(top_srcdir)/am/pre-inst-guile
-ice-9/psyntax-pp.scm: ice-9/psyntax.scm
+ice-9/psyntax-pp.scm.gen:
        $(preinstguile) --no-autocompile -s $(srcdir)/ice-9/compile-psyntax.scm 
\
                $(srcdir)/ice-9/psyntax.scm $(srcdir)/ice-9/psyntax-pp.scm
        touch -r "$(srcdir)/ice-9/psyntax.scm" "$(srcdir)/ice-9/psyntax-pp.scm"
-       rm -f ice-9/psyntax-pp.go
 
 ice-9/psyntax-pp.go: ice-9/psyntax-pp.scm
        GUILE_AUTO_COMPILE=0                                    \
        $(top_builddir)/meta/uninstalled-env                    \
        guile-tools compile $(GUILE_WARNINGS) -o "ice-9/psyntax-pp.go" 
"$(srcdir)/ice-9/psyntax.scm"
+       touch -r "$(srcdir)/ice-9/psyntax.scm" "$(srcdir)/ice-9/psyntax-pp.scm"
 
 SCHEME_LANG_SOURCES =                                          \
   language/scheme/spec.scm                                     \
diff --git a/module/ice-9/buffered-input.scm b/module/ice-9/buffered-input.scm
index 05e9255..c35fdb8 100644
--- a/module/ice-9/buffered-input.scm
+++ b/module/ice-9/buffered-input.scm
@@ -64,7 +64,10 @@ with @var{continuation?} set to @code{#t}."
              (lambda ()
                (cond 
                 ((eof-object? read-string)
-                 read-string)
+                  (let ((eof read-string))
+                    (set! read-string "")
+                    (set! string-index -1)
+                    eof))
                 ((>= string-index (string-length read-string))
                  (set! string-index -1)
                   (get-character))


hooks/post-receive
-- 
GNU Guile