summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenichi Handa <handa@m17n.org>2009-04-13 12:59:07 +0000
committerKenichi Handa <handa@m17n.org>2009-04-13 12:59:07 +0000
commit759f43a0c492d77d09f6c95c7f581811e4ef2e19 (patch)
tree903fabc76cc5ce82dbde0a80caa07215406cbd9c
parenta8a3728b90d75d89368be8e35d5c26468e071d5c (diff)
downloademacs-759f43a0c492d77d09f6c95c7f581811e4ef2e19.tar.gz
(cp932): Delete alias for japanese-shift-jis.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/language/japanese.el1
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index feaee50a32d..c50a95df7ab 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-13 Kenichi Handa <handa@m17n.org>
+
+ * language/japanese.el (cp932): Delete alias for
+ japanese-shift-jis.
+
2009-04-12 Michael Albinus <michael.albinus@gmx.de>
* net/tramp.el (tramp-do-copy-or-rename-file-directly): Overwrite
diff --git a/lisp/language/japanese.el b/lisp/language/japanese.el
index 0972b33554e..dbd42582f87 100644
--- a/lisp/language/japanese.el
+++ b/lisp/language/japanese.el
@@ -101,7 +101,6 @@
(define-coding-system-alias 'shift_jis 'japanese-shift-jis)
(define-coding-system-alias 'sjis 'japanese-shift-jis)
-(define-coding-system-alias 'cp932 'japanese-shift-jis)
(define-coding-system 'japanese-cp932
"CP932 (Microsoft shift-jis)"