[armedbear-cvs] r11432 - branches/open-external-format/src/org/armedbear/lisp

[Erik Huelsmann]

Author: ehuelsmann
Date: Sun Dec  7 21:50:26 2008
New Revision: 11432

Log:
Support setting external format parameters without affecting the chosen encoding.

Modified:
   branches/open-external-format/src/org/armedbear/lisp/Stream.java

Modified: branches/open-external-format/src/org/armedbear/lisp/Stream.java
==============================================================================
--- branches/open-external-format/src/org/armedbear/lisp/Stream.java	(original)
+++ branches/open-external-format/src/org/armedbear/lisp/Stream.java	Sun Dec  7 21:50:26 2008
@@ -319,6 +319,12 @@
           encoding = enc.toString();
       else if (enc instanceof AbstractString)
           encoding = enc.getStringValue();
+      else if (enc == keywordDefault)
+          // This allows the user to use the encoding determined by
+          // Java to be the default for the current environment
+          // while still being able to set other stream options
+          // (e.g. :EOL-STYLE)
+          encoding = null;
       else if (enc instanceof Symbol)
           encoding = ((Symbol)enc).getName();
       else