(pc-select-selection-keys-only, pc-selection-mode): Fix spellings in docstrings.

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

diff --git a/lisp/international/iso-cvt.el b/lisp/international/iso-cvt.el
index eab80db..f896773 100644 (file)
--- a/lisp/international/iso-cvt.el
+++ b/lisp/international/iso-cvt.el
@@ -1,8 +1,8 @@
 ;;; iso-cvt.el --- translate ISO 8859-1 from/to various encodings -*- coding: iso-latin-1 -*-
 ;; This file was formerly called gm-lingo.el.
 
-;; Copyright (C) 1993, 1994, 1995, 1996, 1998, 2000, 2003, 2004
-;;           Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2003, 2004
+;;   Free Software Foundation, Inc.
 
 ;; Author: Michael Gschwind <mike@vlsivie.tuwien.ac.at>
 ;; Keywords: tex, iso, latin, i18n
@@ -265,10 +265,16 @@ Optional arg BUFFER is ignored (for use in `format-alist')."
     ("\\\\`e" "è")
     ("\\\\'e" "é")
     ("\\\\^e" "ê")
-    ("\\\\\"\\\\i" "ï")
-    ("\\\\`\\\\i" "ì")
-    ("\\\\'\\\\i" "í")
-    ("\\\\^\\\\i" "î")
+    ;; Discard spaces and/or one EOF after macro \i.
+    ;; Converting it back will use braces.
+    ("\\\\\"\\\\i *\n\n" "ï\n\n")
+    ("\\\\\"\\\\i *\n?" "ï")
+    ("\\\\`\\\\i *\n\n" "ì\n\n")
+    ("\\\\`\\\\i *\n?" "ì")
+    ("\\\\'\\\\i *\n\n" "í\n\n")
+    ("\\\\'\\\\i *\n?" "í")
+    ("\\\\^\\\\i *\n\n" "î\n\n")
+    ("\\\\^\\\\i *\n?" "î")
     ("\\\\\"i" "ï")
     ("\\\\`i" "ì")
     ("\\\\'i" "í")
@@ -785,6 +791,7 @@ Optional arg BUFFER is ignored (for use in `format-alist')."
     ("&iuml;" "ï")
     ("&eth;" "ð")
     ("&ntilde;" "ñ")
+    ("&nbsp;" " ")
     ("&ograve;" "ò")
     ("&oacute;" "ó")
     ("&ocirc;" "ô")
@@ -858,7 +865,7 @@ Optional arg BUFFER is ignored (for use in `format-alist')."
     (define-key menu [translate-from] '("Translate from..." . iso-cvt-translate-from))
     (fset 'iso-cvt-translate-from translate-from-menu-map)
 
-    (dolist ((file-type (reverse format-alist)))
+    (dolist (file-type (reverse format-alist))
       (let ((name (car file-type))
            (str-name (cadr file-type)))
        (if (stringp str-name)