[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.5-80-gbe79627

[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=be79627c21ba0848af3ac7bea25293170fec6480

The branch, stable-2.0 has been updated
       via  be79627c21ba0848af3ac7bea25293170fec6480 (commit)
      from  da35d2eaa9dbc1d3cf098c9a1c9bc62dcb2515bd (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 be79627c21ba0848af3ac7bea25293170fec6480
Author: Ian Price <address@hidden>
Date:   Fri Jan 27 06:38:09 2012 +0000

    Fix flush on soft ports, so that it actually runs.
    
    * libguile/vports.c (sf_flush): Remove conditional testing the
      position in the port's write_buf, as it is no longer used.

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

Summary of changes:
 libguile/vports.c |   20 +++++---------------
 1 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/libguile/vports.c b/libguile/vports.c
index 5178d79..75e7df3 100644
--- a/libguile/vports.c
+++ b/libguile/vports.c
@@ -56,21 +56,11 @@ sf_flush (SCM port)
   scm_t_port *pt = SCM_PTAB_ENTRY (port);
   SCM stream = SCM_PACK (pt->stream);
 
-  if (pt->write_pos > pt->write_buf)
-    {
-      /* write the byte. */
-      scm_call_1 (SCM_SIMPLE_VECTOR_REF (stream, 0),
-                 SCM_MAKE_CHAR (*pt->write_buf));
-      pt->write_pos = pt->write_buf;
-  
-      /* flush the output.  */
-      {
-       SCM f = SCM_SIMPLE_VECTOR_REF (stream, 2);
+  SCM f = SCM_SIMPLE_VECTOR_REF (stream, 2);
+
+  if (scm_is_true (f))
+    scm_call_0 (f);
 
-       if (scm_is_true (f))
-         scm_call_0 (f);
-      }
-    }
 }
 
 static void


hooks/post-receive
-- 
GNU Guile