Merge changes from emacs-23 branch

[gnu-emacs] / lisp / international / iso-transl.el

diff --git a/lisp/international/iso-transl.el b/lisp/international/iso-transl.el
index 60ad205085a4391f3b8bd9ebf0047b75a317e0af..49b1f6ef23172455bbb6bd57eb724ca19de8a68d 100644 (file)
--- a/lisp/international/iso-transl.el
+++ b/lisp/international/iso-transl.el
@@ -1,7 +1,6 @@
 ;;; iso-transl.el --- keyboard input definitions for ISO 8859-1  -*- coding: iso-8859-1 -*-
 
-;; Copyright (C) 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1987, 1993-1999, 2001-2011  Free Software Foundation, Inc.
 
 ;; Author: Howard Gayle
 ;; Maintainer: FSF
@@ -9,10 +8,10 @@
 
 ;; 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,9 +19,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., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -41,8 +38,8 @@
 ;;; Code:
 
 ;;; Provide some binding for startup:
-;;;###autoload (or global-key-translation-map (setq global-key-translation-map (make-sparse-keymap)))
-;;;###autoload (define-key global-key-translation-map "\C-x8" 'iso-transl-ctl-x-8-map)
+;;;###autoload (or key-translation-map (setq key-translation-map (make-sparse-keymap)))
+;;;###autoload (define-key key-translation-map "\C-x8" 'iso-transl-ctl-x-8-map)
 ;;;###autoload (autoload 'iso-transl-ctl-x-8-map "iso-transl" "Keymap for C-x 8 prefix." t 'keymap)
 
 (defvar iso-transl-dead-key-alist
@@ -245,9 +242,9 @@ sequence VECTOR.  (VECTOR is normally one character long.)")
 (or iso-transl-ctl-x-8-map
     (fset 'iso-transl-ctl-x-8-map
          (setq iso-transl-ctl-x-8-map (make-sparse-keymap))))
-(or global-key-translation-map
-    (setq global-key-translation-map (make-sparse-keymap)))
-(define-key global-key-translation-map "\C-x8" iso-transl-ctl-x-8-map)
+(or key-translation-map
+    (setq key-translation-map (make-sparse-keymap)))
+(define-key key-translation-map "\C-x8" iso-transl-ctl-x-8-map)
 
 ;; For each entry in the alist, we'll make up to three ways to generate
 ;; the character in question: the prefix `C-x 8'; the ALT modifier on
@@ -263,7 +260,7 @@ sequence VECTOR.  (VECTOR is normally one character long.)")
            (vec (vconcat (car (car alist))))
            (tail iso-transl-dead-key-alist))
        (aset vec 0 (logior (aref vec 0) ?\A-\^@))
-       (define-key global-key-translation-map vec translated-vec)
+       (define-key key-translation-map vec translated-vec)
        (define-key isearch-mode-map (vector (aref vec 0)) nil)
        (while tail
          (if (eq (car (car tail)) inchar)
@@ -271,7 +268,7 @@ sequence VECTOR.  (VECTOR is normally one character long.)")
                    (deadkey (cdr (car tail))))
                (aset deadvec 0 deadkey)
                (define-key isearch-mode-map (vector deadkey) nil)
-               (define-key global-key-translation-map deadvec translated-vec)))
+               (define-key key-translation-map deadvec translated-vec)))
          (setq tail (cdr tail)))))
     (setq alist (cdr alist))))
 
@@ -293,5 +290,4 @@ sequence VECTOR.  (VECTOR is normally one character long.)")
 
 (provide 'iso-transl)
 
-;;; arch-tag: 034cfedf-7ebd-461d-bcd0-5c79e6dc0b61
 ;;; iso-transl.el ends here