Carefully fix problems caused by changing char-set:graphic.

diff --git a/src/compiler/machines/C/cout.scm b/src/compiler/machines/C/cout.scm
index ae0974500f91f7c434cbe29ace91c7f92d56c0f4..07de698dc9615e60ac2997604b8a325b8ab2fcc2 100644 (file)
--- a/src/compiler/machines/C/cout.scm
+++ b/src/compiler/machines/C/cout.scm
@@ -589,9 +589,7 @@ USA.
 
 (define char-set:C-string-quoted
   (char-set-union
 
 (define char-set:C-string-quoted
   (char-set-union

-   ;; Not char-set:not-graphic
-   (char-set-invert
-    (char-set-intersection char-set:graphic (ucs-range->char-set 0 #x7f)))
+   (char-set-invert (ucs-range->char-set #x20 #x7F))

    (char-set #\\ #\" #\? (integer->char #xA0))))
 
 (define char-set:C-named-chars
    (char-set #\\ #\" #\? (integer->char #xA0))))
 
 (define char-set:C-named-chars

diff --git a/src/edwin/adapters.scm b/src/edwin/adapters.scm
index aca5e3e6155045eb80e4313fe622ab37cdb9750a..520c6c8d260c44902211be0de6a0dad57269780c 100644 (file)
--- a/src/edwin/adapters.scm
+++ b/src/edwin/adapters.scm
@@ -57,4 +57,8 @@ USA.
   (call-with-file-adapter call-with-input-file))
 
 (define edwin:call-with-output-file
   (call-with-file-adapter call-with-input-file))
 
 (define edwin:call-with-output-file

-  (call-with-file-adapter call-with-output-file))
\ No newline at end of file
+  (call-with-file-adapter call-with-output-file))
+
+(define char-set:graphic
+  (char-set-union (ucs-range->char-set #x20 #x7F)
+                 (ucs-range->char-set #xA0 #x100)))
\ No newline at end of file

diff --git a/src/edwin/edwin.pkg b/src/edwin/edwin.pkg
index 3c5a0fda992a59a80af619220adf3575b8e1d0a5..979571b10060417b6985a9429b0118671a70c51f 100644 (file)
--- a/src/edwin/edwin.pkg
+++ b/src/edwin/edwin.pkg
@@ -157,7 +157,8 @@ USA.
   (export (edwin)
           (call-with-append-file edwin:call-with-append-file)
           (call-with-input-file edwin:call-with-input-file)
   (export (edwin)
           (call-with-append-file edwin:call-with-append-file)
           (call-with-input-file edwin:call-with-input-file)

-          (call-with-output-file edwin:call-with-output-file)))
+          (call-with-output-file edwin:call-with-output-file)
+         char-set:graphic))

 
 (define-package (edwin string)
   (files "string")
 
 (define-package (edwin string)
   (files "string")

diff --git a/src/edwin/modefs.scm b/src/edwin/modefs.scm
index 47a0fa7ade1e1c199e7122003354d4f442c7cfd6..8558ef9aeb8e7145a44b7d2b519c070578b36f39 100644 (file)
--- a/src/edwin/modefs.scm
+++ b/src/edwin/modefs.scm
@@ -48,7 +48,8 @@ Most other major modes are defined by comparison to this one.")
 
 ;; The extra range allows international keyboards to insert 8-bit characters
 (define char-set:self-insert-keys
 
 ;; The extra range allows international keyboards to insert 8-bit characters
 (define char-set:self-insert-keys

-  (char-set-union char-set:printing (ucs-range->char-set 128 255)))
+  (char-set-union (ucs-range->char-set #x20 #x7F)
+                 (ucs-range->char-set #x80 #xFF)))

 
 (define-key 'fundamental char-set:self-insert-keys 'self-insert-command)
 (define-key 'fundamental char-set:numeric 'auto-digit-argument)
 
 (define-key 'fundamental char-set:self-insert-keys 'self-insert-command)
 (define-key 'fundamental char-set:numeric 'auto-digit-argument)

diff --git a/tests/runtime/test-mime-codec.scm b/tests/runtime/test-mime-codec.scm
index 76320d11958a91c9371b72df8edb06141d3a67ee..307676696457c86fe6f7d48c87f4ec41ffc39bf8 100644 (file)
--- a/tests/runtime/test-mime-codec.scm
+++ b/tests/runtime/test-mime-codec.scm
@@ -71,9 +71,10 @@ USA.
     (builder 'immutable)))
 
 (define text-characters
     (builder 'immutable)))
 
 (define text-characters

-  (list->string
-   (append '(#\tab #\newline)
-          (char-set-members char-set:graphic))))
+  (char-set->string
+   (char-set-union (ucs-range->char-set #x20 #x7F)
+                  (ucs-range->char-set #xA0 #x100)
+                  (char-set #\tab #\newline))))

 \f
 (define (test-codec n-packets packet-length text? filename binary-codec?
                    encode:initialize encode:finalize encode:update
 \f
 (define (test-codec n-packets packet-length text? filename binary-codec?
                    encode:initialize encode:finalize encode:update