Use ANSI fonts for iso10646-1 if UNICODE is not defined in system headers.

diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el
index 52bd0f97a817a59e2545b892e65c411a6b6b143c..256aecc42d79007b67fb1a68b2291796faebfff3 100644 (file)
--- a/lisp/w32-fns.el
+++ b/lisp/w32-fns.el
@@ -402,9 +402,10 @@ bit output with no translation."
       (w32-add-charset-info "mac" 'w32-charset-mac nil)))
 (if (boundp 'w32-unicode-charset-defined)
     (progn
-      (w32-add-charset-info "iso10646" 'w32-charset-unicode t)
-      (w32-add-charset-info "unicode" 'w32-charset-unicode t)))
-
+      (w32-add-charset-info "iso10646-1" 'w32-charset-unicode t)
+      (w32-add-charset-info "unicode" 'w32-charset-unicode t))
+  ;; If unicode windows charset is not defined, use ansi fonts.
+  (w32-add-charset-info "iso10646-1" 'w32-charset-ansi t))
 
 (make-obsolete-variable 'w32-enable-italics
                         'w32-enable-synthesized-fonts "21.1")