Merge from emacs--devo--0

[gnu-emacs] / lisp / language / chinese.el

diff --git a/lisp/language/chinese.el b/lisp/language/chinese.el
index fdb4dae710ae4307b13f5282baa031e08b9841c3..d4010dbff97102f3468e0b261055a03d5f54fb9b 100644 (file)
--- a/lisp/language/chinese.el
+++ b/lisp/language/chinese.el
@@ -16,7 +16,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -93,7 +93,6 @@
 (define-coding-system-alias 'euc-cn 'chinese-iso-8bit)
 (define-coding-system-alias 'cn-gb 'chinese-iso-8bit)
 (define-coding-system-alias 'gb2312 'chinese-iso-8bit)
-(define-coding-system-alias 'cp936 'chinese-iso-8bit)
 
 (define-coding-system 'chinese-hz
   "Hz/ZW 7-bit encoding for Chinese GB2312 (MIME:HZ-GB-2312)."