X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/ae940284fa77a6928f5162b7de859e67bdc7506c..acaf905b1130aae80fa59d2c861ffd4c8eb75486:/lisp/language/japanese.el

diff --git a/lisp/language/japanese.el b/lisp/language/japanese.el
index 0972b33554..256263edbb 100644
--- a/lisp/language/japanese.el
+++ b/lisp/language/japanese.el
@@ -1,9 +1,8 @@
 ;;; japanese.el --- support for Japanese -*- coding: iso-2022-7bit; no-byte-compile: t -*-
 
-;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001-2012  Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009
+;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 ;; Copyright (C) 2003
@@ -101,7 +100,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)"
@@ -184,7 +182,7 @@ eucJP-ms is defined in <http://www.opengroup.or.jp/jvc/cde/appendix.html>."
 (define-coding-system-alias 'euc-jisx0213 'euc-jis-2004)
 
 (define-coding-system 'japanese-shift-jis-2004
-  "Shift_JIS 8-bit encodinf for Japanese (MIME:SHIFT_JIS-2004)"
+  "Shift_JIS 8-bit encoding for Japanese (MIME:SHIFT_JIS-2004)"
   :coding-type 'shift-jis
   :mnemonic ?S
   :charset-list '(ascii katakana-jisx0201 
@@ -275,5 +273,4 @@ and the second is a glyph for a variation selector."
 
 (provide 'japanese)
 
-;; arch-tag: 450f5537-9d53-4d5e-b731-4cf116d8cbc9
 ;;; japanese.el ends here