1 files changed, 2 insertions, 8 deletions
diff --git a/io.c b/io.c
index 39ee4d7c2f..40975f7753 100644
--- a/io.c
+++ b/io.c
@@ -5883,10 +5883,7 @@ argf_next_argv(VALUE argf)
 		rb_io_t *fptr;
 
 		GetOpenFile(current_file, fptr);
-		fptr->encs.enc = argf_enc;
-		fptr->encs.enc2 = argf_enc2;
-		fptr->encs.flags = argf_ecflags;
-		fptr->encs.ecopts = argf_ecopts;
+		fptr->encs = ARGF.encs;
                 clear_codeconv(fptr);
 	    }
 	}
@@ -7563,10 +7560,7 @@ argf_set_encoding(int argc, VALUE *argv, VALUE argf)
     }
     rb_io_set_encoding(argc, argv, current_file);
     GetOpenFile(current_file, fptr);
-    argf_enc = fptr->encs.enc;
-    argf_enc2 = fptr->encs.enc2;
-    argf_ecflags = fptr->encs.flags;
-    argf_ecopts = fptr->encs.ecopts;
+    ARGF.encs = fptr->encs;
     return argf;
 }