more unicode follow up

Set the unicode restriction bit when loading a symset when appropriate,
and a win32 console refinement.

diff --git a/src/files.c b/src/files.c
index 1dffde979f8d94899b7d2e08d139e8e9b75a6228..74ba5c7b766ab58ed71cd6975a68b362f54b8b01 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -2651,6 +2651,8 @@ int which_set;
                                                 break;
                                        case  1: symset[which_set].rogue   = 1;
                                                 break;
+                                       case  2: symset[which_set].unicode = 1;
+                                                break;
                                    }
                                    break;      /* while loop */
                                    }

diff --git a/sys/winnt/nttty.c b/sys/winnt/nttty.c
index 412d37747f47a91fff38898f48638a0fbcfec8df..368c42af921fc22ac16a77a9a0fe58f61339d947 100644 (file)
--- a/sys/winnt/nttty.c
+++ b/sys/winnt/nttty.c
@@ -611,7 +611,8 @@ int in_sym;
        cursor.Y = ttyDisplay->cury;
        WriteConsoleOutputAttribute(hConOut,&attr,1,cursor,&acount);
 #ifdef UNICODE_DRAWING
-       if (symset[currentgraphics].name && iflags.unicodedisp)
+       if (symset[currentgraphics].name && 
+               symset[currentgraphics].unicode && iflags.unicodedisp)
            WriteConsoleOutputCharacterW(hConOut,(LPCWSTR)&in_sym,1,cursor,&ccount);
        else
 #endif