Merge commit '8ca97482b01cf1a6aa538cc5a2d1f71fb60f080c'

Conflicts:
	libguile/r6rs-ports.c

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

diff --cc libguile/r6rs-ports.c
index a8fc3f1,30456a8..6daa505
--- 1/libguile/r6rs-ports.c
--- 2/libguile/r6rs-ports.c
+++ b/libguile/r6rs-ports.c
@@@ -410,6 -488,6 +469,7 @@@ initialize_custom_binary_input_ports (v
  
    scm_set_port_seek (custom_binary_input_port_type, cbp_seek);
    scm_set_port_close (custom_binary_input_port_type, cbp_close);
++  scm_set_port_setvbuf (custom_binary_input_port_type, cbip_setvbuf);
  }
  
  

diff --cc test-suite/tests/r6rs-ports.test
Simple merge