Merge branch 'stable-2.0'

diff --cc libguile/print.c
index 4fe9b77,ae98af4..4ad2a95
--- 1/libguile/print.c
--- 2/libguile/print.c
+++ b/libguile/print.c
@@@ -494,17 -453,21 +494,21 @@@ print_r7rs_extended_symbol (SCM sym, SC
  
        switch (c)
          {
 -        case '\a': scm_lfwrite ("\\a", 2, port); break;
 -        case '\b': scm_lfwrite ("\\b", 2, port); break;
 -        case '\t': scm_lfwrite ("\\t", 2, port); break;
 -        case '\n': scm_lfwrite ("\\n", 2, port); break;
 -        case '\r': scm_lfwrite ("\\r", 2, port); break;
 -        case '|':  scm_lfwrite ("\\|", 2, port); break;
 -        case '\\': scm_lfwrite ("\\x5c;", 5, port); break;
 +        case '\a': scm_lfwrite_unlocked ("\\a", 2, port); break;
 +        case '\b': scm_lfwrite_unlocked ("\\b", 2, port); break;
 +        case '\t': scm_lfwrite_unlocked ("\\t", 2, port); break;
 +        case '\n': scm_lfwrite_unlocked ("\\n", 2, port); break;
 +        case '\r': scm_lfwrite_unlocked ("\\r", 2, port); break;
 +        case '|':  scm_lfwrite_unlocked ("\\|", 2, port); break;
 +        case '\\': scm_lfwrite_unlocked ("\\x5c;", 5, port); break;
          default:
            if (uc_is_general_category_withtable (c,
-                                                 SUBSEQUENT_IDENTIFIER_MASK
-                                                 | UC_CATEGORY_MASK_Zs))
+                                                 UC_CATEGORY_MASK_L
+                                                 | UC_CATEGORY_MASK_M
+                                                 | UC_CATEGORY_MASK_N
+                                                 | UC_CATEGORY_MASK_P
+                                                 | UC_CATEGORY_MASK_S)
+               || (c == ' '))
              {
                if (!display_character (c, port, strategy))
                  scm_encoding_error ("print_r7rs_extended_symbol", errno,

diff --cc test-suite/tests/print.test
Simple merge