Merge from mainline.

[bpt/emacs.git] / leim / quail / slovak.el

diff --git a/leim/quail/slovak.el b/leim/quail/slovak.el
index ba9752a..cfc35b0 100644 (file)
--- a/leim/quail/slovak.el
+++ b/leim/quail/slovak.el
@@ -1,18 +1,18 @@
-;;; quail/slovak.el -- Quail package for inputting Slovak
+;;; slovak.el --- Quail package for inputting Slovak  -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 1998 Free Software Foundation.
+;; Copyright (C) 1998, 2001-2011  Free Software Foundation, Inc.
 
-;; Authors:    Tibor \e,B)\e(Bimko <tibor.simko@fmph.uniba.sk>,
-;;             Milan Zamazal <pdm@fi.muni.cz>
-;; Maintainer: Milan Zamazal <pdm@fi.muni.cz>
-;; Keywords: multilingual, input method, Slovak
+;; Authors: Tibor \e,B)\e(Bimko <tibor.simko@fmph.uniba.sk>
+;;     Milan Zamazal <pdm@zamazal.org>
+;; Maintainer: Pavel Jan\e,Bm\e(Bk <Pavel@Janik.cz>
+;; Keywords: i18n, multilingual, input method, Slovak
 
 ;; 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
@@ -20,13 +20,11 @@
 ;; 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:
 
-;; This setups some Slovak keyboards:
+;; This file defines the following Slovak keyboards:
 ;; - standard Slovak keyboard
 ;; - three Slovak keyboards for programmers
 
@@ -36,7 +34,7 @@
 
 
 (quail-define-package
- "slovak" "Slovak" "SK" nil
+ "slovak" "Slovak" "SK" t
  "Standard Slovak keyboard."
  nil t nil nil t nil nil nil nil nil t)
 
@@ -61,8 +59,6 @@
  ("*" ?8)
  ("(" ?9)
  (")" ?0)
- ("q" ?`)
- ("Q" ?`)
  ("-" ?=)
  ("_" ?%)
  ("=" ?')
@@ -136,10 +132,7 @@
  ("+=U" ?\e,B\\e(B)
  ("=Z" ?\e,B]\e(B)
  ("+Y" ?\e,B.\e(B)
- ("=q" ?q)
- ("+q" ?q)
- ("=Q" ?Q)
- ("+Q" ?Q)
+ ("=q" ?`)
  ("=2" ?@)
  ("=3" ?#)
  ("=4" ?$)
@@ -173,14 +166,14 @@
 
 
 (quail-define-package
- "slovak-prog-1" "Slovak" "SK" nil
+ "slovak-prog-1" "Slovak" "SK" t
  "Slovak (non-standard) keyboard for programmers #1.
 
 All digits except of `1' are replaced by Slovak characters as on the standard
 Slovak keyboard.
 Dead keys are on `[', `[[', and `[[['.
 All other keys are the same as on standard US keyboard."
- nil t nil nil nil nil nil nil nil nil t)
+ nil t nil nil t nil nil nil nil nil t)
 
 (quail-define-rules
  ("[[[[" ?\[)
@@ -267,14 +260,14 @@ All other keys are the same as on standard US keyboard."
 
 
 (quail-define-package
- "slovak-prog-2" "Slovak" "SK" nil
+ "slovak-prog-2" "Slovak" "SK" t
  "Slovak (non-standard) keyboard for programmers #2.
 
 All digits except of `1' are replaced by Slovak characters as on the standard
 Slovak keyboard.
 Dead keys are on `=' and `+'.
 All other keys are the same as on standard US keyboard."
- nil t nil nil nil nil nil nil nil nil t)
+ nil t nil nil t nil nil nil nil nil t)
 
 (quail-define-rules
  ("2" ?\e,B5\e(B)
@@ -369,12 +362,12 @@ All other keys are the same as on standard US keyboard."
 
 
 (quail-define-package
- "slovak-prog-3" "Slovak" "SK" nil
+ "slovak-prog-3" "Slovak" "SK" t
  "Slovak (non-standard) keyboard for programmers #3.
 
 Dead keys are on `[', `[[', `[[[', and `]'.
 All other keys are the same as on standard US keyboard."
- nil t nil nil nil nil nil nil nil nil t)
+ nil t nil nil t nil nil nil nil nil t)
 
 (quail-define-rules
  ("[[[[" ?\[)
@@ -482,3 +475,5 @@ All other keys are the same as on standard US keyboard."
  ([kp-9] ?9)
  ([kp-0] ?0)
  ([kp-add] ?+))
+
+;;; slovak.el ends here