From 59f062ec78bca8ac08284771cc09fdb272888f07 Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@pobox.com>
Date: Tue, 21 Jun 2016 11:07:34 +0200
Subject: [PATCH] Export &i/o-decoding, &i/o-encoding from (rnrs)

* module/rnrs/io/ports.scm (&i/o-decoding, &i/o-encoding): Rename from
  &i/o-decoding-error and &i/o-encoding-error, to conform to R6RS.
* module/rnrs.scm (rnrs): Export &i/o-decoding, &i/o-encoding, their
  accessors and constructors.
---
 module/rnrs.scm          | 7 ++++++-
 module/rnrs/io/ports.scm | 8 ++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/module/rnrs.scm b/module/rnrs.scm
index e4a06faf5..436821642 100644
--- a/module/rnrs.scm
+++ b/module/rnrs.scm
@@ -160,7 +160,12 @@
 
 	  ;; (rnrs io ports)
 
-	  file-options buffer-mode buffer-mode?
+          &i/o-decoding i/o-decoding-error?
+          make-i/o-decoding-error
+          &i/o-encoding i/o-encoding-error-char i/o-encoding-error?
+          make-i/o-encoding-error
+
+          file-options buffer-mode buffer-mode?
 	  eol-style native-eol-style error-handling-mode
 	  make-transcoder transcoder-codec transcoder-eol-style
           transcoder-error-handling-mode native-transcoder
diff --git a/module/rnrs/io/ports.scm b/module/rnrs/io/ports.scm
index 0cceb0672..8ff674894 100644
--- a/module/rnrs/io/ports.scm
+++ b/module/rnrs/io/ports.scm
@@ -101,9 +101,9 @@
           make-i/o-file-does-not-exist-error
           &i/o-port i/o-port-error? make-i/o-port-error
           i/o-error-port
-          &i/o-decoding-error i/o-decoding-error?
+          &i/o-decoding i/o-decoding-error?
           make-i/o-decoding-error
-          &i/o-encoding-error i/o-encoding-error?
+          &i/o-encoding i/o-encoding-error?
           make-i/o-encoding-error i/o-encoding-error-char)
   (import (ice-9 binary-ports)
           (only (rnrs base) assertion-violation)
@@ -411,7 +411,7 @@ line buffered, or @code{block} otherwise."
 
 (define-syntax with-i/o-encoding-error
   (syntax-rules ()
-    "Convert Guile throws to `encoding-error' to `&i/o-encoding-error'."
+    "Convert Guile throws to `encoding-error' to `&i/o-encoding'."
     ((_ body ...)
      ;; XXX: This is heavyweight for small functions like `put-char'.
      (with-throw-handler 'encoding-error
@@ -452,7 +452,7 @@ line buffered, or @code{block} otherwise."
 
 (define-syntax with-i/o-decoding-error
   (syntax-rules ()
-    "Convert Guile throws to `decoding-error' to `&i/o-decoding-error'."
+    "Convert Guile throws to `decoding-error' to `&i/o-decoding'."
     ((_ body ...)
      ;; XXX: This is heavyweight for small functions like `get-char' and
      ;; `lookahead-char'.