1 files changed, 16 insertions, 20 deletions
diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el
index 8ee9d490bb6..e524e530277 100644
--- a/lisp/w32-fns.el
+++ b/lisp/w32-fns.el
@@ -376,26 +376,22 @@ bit output with no translation."
 (w32-add-charset-info "ms-symbol" 'w32-charset-symbol nil)
 (w32-add-charset-info "ms-oem" 'w32-charset-oem 437)
 (w32-add-charset-info "ms-oemlatin" 'w32-charset-oem 850)
-(if (boundp 'w32-extra-charsets-defined)
-    (progn
-      (w32-add-charset-info "iso8859-2" 'w32-charset-easteurope 28592)
-      (w32-add-charset-info "iso8859-3" 'w32-charset-turkish 28593)
-      (w32-add-charset-info "iso8859-4" 'w32-charset-baltic 28594)
-      (w32-add-charset-info "iso8859-6" 'w32-charset-arabic 28596)
-      (w32-add-charset-info "iso8859-7" 'w32-charset-greek 28597)
-      (w32-add-charset-info "iso8859-8" 'w32-charset-hebrew 1255)
-      (w32-add-charset-info "iso8859-9" 'w32-charset-turkish 1254)
-      (w32-add-charset-info "iso8859-13" 'w32-charset-baltic 1257)
-      (w32-add-charset-info "koi8-r" 'w32-charset-russian 20866)
-      (w32-add-charset-info "iso8859-5" 'w32-charset-russian 28595)
-      (w32-add-charset-info "tis620" 'w32-charset-thai 874)
-      (w32-add-charset-info "windows-1258" 'w32-charset-vietnamese 1258)
-      (w32-add-charset-info "ksc5601.1992" 'w32-charset-johab 1361)
-      (w32-add-charset-info "mac-roman" 'w32-charset-mac 10000)))
-(if (boundp 'w32-unicode-charset-defined)
-    (progn
-      (w32-add-charset-info "iso10646-1" 'w32-charset-unicode t))
-  (w32-add-charset-info "iso10646-1" 'w32-charset-default t))
+(w32-add-charset-info "iso8859-2" 'w32-charset-easteurope 28592)
+(w32-add-charset-info "iso8859-3" 'w32-charset-turkish 28593)
+(w32-add-charset-info "iso8859-4" 'w32-charset-baltic 28594)
+(w32-add-charset-info "iso8859-6" 'w32-charset-arabic 28596)
+(w32-add-charset-info "iso8859-7" 'w32-charset-greek 28597)
+(w32-add-charset-info "iso8859-8" 'w32-charset-hebrew 1255)
+(w32-add-charset-info "iso8859-9" 'w32-charset-turkish 1254)
+(w32-add-charset-info "iso8859-13" 'w32-charset-baltic 1257)
+(w32-add-charset-info "koi8-r" 'w32-charset-russian 20866)
+(w32-add-charset-info "iso8859-5" 'w32-charset-russian 28595)
+(w32-add-charset-info "tis620" 'w32-charset-thai 874)
+(w32-add-charset-info "windows-1258" 'w32-charset-vietnamese 1258)
+(w32-add-charset-info "ksc5601.1992" 'w32-charset-johab 1361)
+(w32-add-charset-info "mac-roman" 'w32-charset-mac 10000)))
+(w32-add-charset-info "iso10646-1" 'w32-charset-default t))
+
 ;;   ;; If unicode windows charset is not defined, use ansi fonts.
 ;;   (w32-add-charset-info "iso10646-1" 'w32-charset-ansi t))