Merge from emacs-24 branch; up to 2012-05-01T10:20:43Z!rgm@gnu.org

[bpt/emacs.git] / lisp / international / iso-transl.el

diff --git a/lisp/international/iso-transl.el b/lisp/international/iso-transl.el
index 79d0373..5d28188 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
-;;   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+;; Copyright (C) 1987, 1993-1999, 2001-2012  Free Software Foundation, Inc.
 
 ;; Author: Howard Gayle
 ;; Maintainer: FSF
@@ -39,7 +38,6 @@
 ;;; Code:
 
 ;;; Provide some binding for startup:
-;;;###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)
 
@@ -284,11 +282,6 @@ sequence VECTOR.  (VECTOR is normally one character long.)")
 ;; with a language-specific mapping by using `M-x iso-transl-set-language'.
 (iso-transl-define-keys iso-transl-char-map)
 
-(define-key isearch-mode-map "\C-x" nil)
-(define-key isearch-mode-map [?\C-x t] 'isearch-other-control-char)
-(define-key isearch-mode-map "\C-x8" nil)
-
-
 (provide 'iso-transl)
 
 ;;; iso-transl.el ends here