(cp932, cp936, cp949, cp950): Remove.

Only add cp125* if windows-125* already defined.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 42428a81964d7ce649cd608105c41dc900000217..b47afc8c4afbbfff89040da6b4e6e5000bc0b88f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,14 @@
 2004-05-09  Jason Rumney  <jasonr@gnu.org>
 
+       * international/code-pages (cp932, cp936, cp949, c950): Remove.
+       Only define cp125* if windows-125* is already defined.
+
+       * language/korean.el (cp949): Add alias.
+
+       * language/chinese.el (cp936, cp950): Add aliases.
+
+       * language/japanese.el (cp932): Add alias.
+
        * term/w32-win.el: Require code-pages.
 
        * international/mule-cmds.el (set-locale-environment): On

diff --git a/lisp/international/code-pages.el b/lisp/international/code-pages.el
index 58bedc84e595fbf71e34c07fcccbb1db5819a920..64c430f9383ab846ca17cdf20a5b34e6440b8c62 100644 (file)
--- a/lisp/international/code-pages.el
+++ b/lisp/international/code-pages.el
@@ -4488,19 +4488,12 @@ Return an updated `non-iso-charset-alist'."
     ;; Define cp125* as aliases for all windows-125*, so on Windows
     ;; we can just concat "cp" to the ANSI codepage we get from the system
     ;; and not have to worry about whether it should be "cp" or "windows-".
-    (define-coding-system-alias c w)
+    (if (coding-system-p w)
+       (define-coding-system-alias c w))
     ;; Compatibility with codepage.el, though cp... are not the
     ;; canonical names.
     (push (assoc w non-iso-charset-alist) non-iso-charset-alist)))
 
-;; DOS/Windows codepages that correspond to coding systems already supported
-;; by Emacs. Only codepages used as system codepages are listed here,
-;; to assist in finding the appropriate coding-system for clipboard etc.
-(define-coding-system-alias 'cp932 'japanese-shift-jis)
-(define-coding-system-alias 'cp936 'chinese-iso-8bit)
-(define-coding-system-alias 'cp949 'korean-iso-8bit)
-(define-coding-system-alias 'cp950 'chinese-big5)
-
 (provide 'code-pages)
 
 ;;; arch-tag: 8b6e3c73-b271-4198-866d-ea6d0ceff1b2