From 64ec7df91d02bda490b03807eac4b1249a26c97b Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Sun, 9 May 2004 21:36:45 +0000 Subject: [PATCH] (cp932, cp936, cp949, cp950): Remove. Only add cp125* if windows-125* already defined. --- lisp/ChangeLog | 9 +++++++++ lisp/international/code-pages.el | 11 ++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 42428a81964..b47afc8c4af 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,14 @@ 2004-05-09 Jason Rumney + * 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 58bedc84e59..64c430f9383 100644 --- 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 -- 2.39.2