(ensure_echo_area_buffers): If a buffer was killed and a

[gnu-emacs] / lisp / w32-fns.el

diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el
index c9f1a53c77197dece7cf738bb874e9be4cd0b7d2..d8a7858c90d212a97dc84df015ff85e2253a63a8 100644 (file)
--- a/lisp/w32-fns.el
+++ b/lisp/w32-fns.el
@@ -52,7 +52,7 @@
   "List of strings recognized as Windows NT/9X system shells.")
 
 (defun w32-using-nt ()
-  "Return t if literally running on Windows NT (i.e., not Windows 9X)."
+  "Return non-nil if literally running on Windows NT (i.e., not Windows 9X)."
   (and (eq system-type 'windows-nt) (getenv "SystemRoot")))
 
 (defun w32-shell-name ()
@@ -359,26 +359,44 @@ CODING-SYSTEM, use \\[list-coding-systems]."
                    ("ms-symbol" . (w32-charset-symbol . nil))
                    ("ms-oem" . (w32-charset-oem . 437))
                    ("ms-oemlatin" . (w32-charset-oem . 850))))
-           (if (boundp 'w32-extra_charsets-defined)
-               (add-to-list
-                'w32-charset-info-alist
-                '(("iso8859-2" . (w32-charset-easteurope . 28592))
-                  ("iso8859-3" . (w32-charset-turkish . 28593))
-                  ("iso8859-4" . (w32-charset-baltic . 28594))
-                  ("iso8859-5" . (w32-charset-russian . 28595))
-                  ("iso8859-6" . (w32-charset-arabic . 28596))
-                  ("iso8859-7" . (w32-charset-greek . 28597))
-                  ("iso8859-8" . (w32-charset-hebrew . 1255))
-                  ("iso8859-9" . (w32-charset-turkish . 1254))
-                  ("iso8859-13" . (w32-charset-baltic . 1257))
-                  ("koi8-r" . (w32-charset-russian . 20866))
-                  ("tis620" . (w32-charset-thai . 874))
-                  ("ksc5601.1992" . (w32-charset-johab . 1361))
-                  ("mac" . (w32-charset-mac . nil)))))
+           (if (boundp 'w32-extra-charsets-defined)
+               (progn
+                 (add-to-list 'w32-charset-info-alist
+                  '("iso8859-2" . (w32-charset-easteurope . 28592)))
+                 (add-to-list 'w32-charset-info-alist
+                  '("iso8859-3" . (w32-charset-turkish . 28593)))
+                 (add-to-list 'w32-charset-info-alist
+                  '("iso8859-4" . (w32-charset-baltic . 28594)))
+                 (add-to-list 'w32-charset-info-alist
+                  '("iso8859-5" . (w32-charset-russian . 28595)))
+                 (add-to-list 'w32-charset-info-alist
+                  '("iso8859-6" . (w32-charset-arabic . 28596)))
+                 (add-to-list 'w32-charset-info-alist
+                  '("iso8859-7" . (w32-charset-greek . 28597)))
+                 (add-to-list 'w32-charset-info-alist
+                  '("iso8859-8" . (w32-charset-hebrew . 1255)))
+                 (add-to-list 'w32-charset-info-alist
+                  '("iso8859-9" . (w32-charset-turkish . 1254)))
+                 (add-to-list 'w32-charset-info-alist
+                  '("iso8859-13" . (w32-charset-baltic . 1257)))
+                 (add-to-list 'w32-charset-info-alist
+                  '("koi8-r" . (w32-charset-russian . 20866)))
+                 (add-to-list 'w32-charset-info-alist
+                  '("tis620" . (w32-charset-thai . 874)))
+                 (add-to-list 'w32-charset-info-alist
+                  '("ksc5601.1992" . (w32-charset-johab . 1361)))
+                 (add-to-list 'w32-charset-info-alist
+                  '("mac" . (w32-charset-mac . nil))))))
            (if (boundp 'w32-unicode-charset-defined)
-               (add-to-list
-                'w32-charset-info-alist
-                '(("iso10646" . (w32-charset-unicode . t))
-                  ("unicode" . (w32-charset-unicode . t)))))))
+               (progn
+                 (add-to-list 'w32-charset-info-alist
+                  '("iso10646" . (w32-charset-unicode . t)))
+                 (add-to-list 'w32-charset-info-alist
+                  '("unicode" . (w32-charset-unicode . t))))))
+
+(make-obsolete-variable 'w32-enable-italics 'w32-enable-synthesized-fonts)
+(make-obsolete-variable 'w32-charset-to-codepage-alist
+    "w32-charset-to-codepage-alist has been replaced by the more extensive
+w32-charset-info-alist")
 
 ;;; w32-fns.el ends here