(set-locale-environment): On MS-Windows use ansi code-page for default

coding-systems.  Set up paper sizes for Windows 3 letter languages.

2 files changed, 24 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a64fdff7df0..b782263ffd4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2004-05-09  Jason Rumney  <jasonr@gnu.org>
+
+        * international/mule-cmds.el (set-locale-environment): On
+        MS-Windows use ansi code-page for default coding-systems.
+        Set up paper sizes for Windows 3 letter languages.
+
+        * international/code-pages.el (cp932, cp936, cp949, cp950): Add
+        aliases.  Also add cp125* if not already defined.
+
 2004-05-09  Juanma Barranquero  <lektu@terra.es>
 
         * net/quickurl.el (quickurl, quickurl-browse-url, quickurl-read):
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 0b7aa54a288..b8c071b8585 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -2413,6 +2413,16 @@ See also `locale-charset-language-names', `locale-language-names',
           (prefer-coding-system coding-system)
           (setq locale-coding-system coding-system))))
 
+    ;; On Windows, override locale-coding-system, keyboard-coding-system,
+    ;; selection-coding-system with system codepage.
+    (when (boundp w32-ansi-code-page)
+      (let ((code-page-coding (intern (format "cp%d" w32-ansi-code-page))))
+        (when (coding-system-p code-page-coding)
+          (setq locale-coding-system code-page-coding)
+          (set-selection-coding-system code-page-coding)
+          (set-keyboard-coding-system code-page-coding)
+          (set-terminal-coding-system code-page-coding))))
+
     ;; Default to A4 paper if we're not in a C, POSIX or US locale.
     ;; (See comments in Flocale_info.)
     (let ((locale locale)
@@ -2435,7 +2445,11 @@ See also `locale-charset-language-names', `locale-language-names',
                                                 ("posix$" . letter)
                                                 (".._us" . letter)
                                                 (".._pr" . letter)
-                                                (".._ca" . letter)))
+                                                (".._ca" . letter)
+                                                ("enu$" . letter) ; Windows
+                                                ("esu$" . letter)
+                                                ("enc$" . letter)
+                                                ("frc$" . letter)))
                     'a4))))))
   nil)