Merge changes from emacs-23 branch.

[gnu-emacs] / leim / quail / cyril-jis.el

diff --git a/leim/quail/cyril-jis.el b/leim/quail/cyril-jis.el
index fc574264b88340663d74c81796999e0f3847e2cf..5aef398d4a3d24d86e74ee9fb0a8a90a416c32a2 100644 (file)
--- a/leim/quail/cyril-jis.el
+++ b/leim/quail/cyril-jis.el
@@ -1,16 +1,20 @@
-;;; quail/cyril-jis.el -- Quail package for inputting JISX0208 Cyrillic letters
+;;; cyril-jis.el --- Quail package for inputting JISX0208 Cyrillic letters
 
-;; Copyright (C) 1997 Electrotechnical Laboratory, JAPAN.
-;; Licensed to the Free Software Foundation.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+;;   Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007, 2008, 2009, 2010
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 
 ;; Keywords: multilingual, input method, Cyrillic
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; 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)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -33,7 +35,7 @@
 (quail-define-package
  "cyrillic-jis-russian" "Cyrillic" "\e$B'('+\e(B" nil
  "\e$B'+'8'5','&'/\e(B keyboard layout same as JCUKEN (JIS X0208.1983 encoding)"
-                     nil t t t t)
+ nil t t t t nil nil nil nil nil t)
 
 ;;  1! 2@ 3# 4" 5: 6, 7. 8* 9( 0) -_ =+ \e,L!\e(B
 ;;   \e,L9\e(B  \e,LF\e(B  \e,LC\e(B  \e,L:\e(B  \e,L5\e(B  \e,L=\e(B  \e,L3\e(B  \e,LH\e(B  \e,LI\e(B  \e,L7\e(B  \e,LE\e(B  \e,Lj\e(B
@@ -88,7 +90,7 @@
  ("," ?\e$B'R\e(B)
  ("." ?\e$B'p\e(B)
  ("/" ?\e$B!?\e(B)
- 
+
  ("!" ?\e$B!*\e(B)
  ("@" ?\e$B!w\e(B)
  ("#" ?\e$B!t\e(B)
@@ -138,5 +140,8 @@
  ("?" ?\e$B!)\e(B))
 
 ;; Local Variables:
-;; buffer-file-coding-system: iso-2022-7bit
+;; coding: iso-2022-7bit
 ;; End:
+
+;; arch-tag: 3a0cc2ac-de48-42fe-9e80-05d8aa6faa36
+;;; cyril-jis.el ends here