Merge remote-tracking branch 'origin/stable-2.0'

Conflicts:
	libguile/r6rs-ports.c

diff --cc doc/ref/api-data.texi
Simple merge

diff --cc libguile/r6rs-ports.c
index 07845c3,7ee7a69..7d07051
--- 1/libguile/r6rs-ports.c
--- 2/libguile/r6rs-ports.c
+++ b/libguile/r6rs-ports.c
@@@ -644,10 -650,10 +635,10 @@@ SCM_DEFINE (scm_get_bytevector_all, "ge
  
        /* `scm_c_read ()' blocks until C_COUNT bytes are available or EOF is
         reached.  */
 -      c_read = scm_c_read (port, c_bv + c_total, c_count);
 +      c_read = scm_c_read_unlocked (port, c_bv + c_total, c_count);
        c_total += c_read, c_count -= c_read;
      }
-   while (scm_peek_byte_or_eof (port) != EOF);
+   while (c_count == 0);
  
    if (c_total == 0)
      {

diff --cc libguile/strings.c
Simple merge