Fix previous change.

[gnu-emacs] / lisp / international / mule-cmds.el

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 413d969b932bc356cde632be9179df8476330c92..214ab7912616482ffdde3763b9c19ad64f75c84f 100644 (file)
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1,8 +1,9 @@
 ;;; mule-cmds.el --- commands for mulitilingual environment -*-coding: iso-2022-7bit -*-
 
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-;;   Free Software Foundation, Inc.
-;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007  Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
@@ -736,18 +737,18 @@ DEFAULT is the coding system to use by default in the query."
              (insert "\n")
              (fill-region-as-paragraph pos (point)))
            (when rejected
-             (insert "These safely encodes the target text,
-but it is not recommended for encoding text in this context,
+             (insert "These safely encode the text in the buffer,
+but are not recommended for encoding text in this context,
 e.g., for sending an email message.\n ")
              (dolist (x rejected)
                (princ " ") (princ x))
              (insert "\n"))
            (when unsafe
-             (insert (if rejected "And the others"
+             (insert (if rejected "The other coding systems"
                        "However, each of them")
-                     " encountered these problematic characters:\n")
+                     " encountered characters it couldn't encode:\n")
              (dolist (coding unsafe)
-               (insert (format "  %s:" (car coding)))
+               (insert (format "  %s cannot encode these:" (car coding)))
                (let ((i 0)
                      (func1
                       #'(lambda (bufname pos)
@@ -771,6 +772,7 @@ e.g., for sending an email message.\n ")
                          (insert-text-button
                           (cdr elt)
                           :type 'help-xref
+                          'face 'link
                           'help-echo
                           "mouse-2, RET: jump to this character"
                           'help-function func1
@@ -778,6 +780,7 @@ e.g., for sending an email message.\n ")
                        (insert-text-button
                         "..."
                         :type 'help-xref
+                        'face 'link
                         'help-echo
                         "mouse-2, RET: next unencodable character"
                         'help-function func2
@@ -785,20 +788,23 @@ e.g., for sending an email message.\n ")
                                          (car coding)))))
                    (setq i (1+ i))))
                (insert "\n"))
-             (insert "\
-The first problematic character is at point in the displayed buffer,\n"
-                     (substitute-command-keys "\
-and \\[universal-argument] \\[what-cursor-position] will give information about it.\n"))))
-         (insert "\nSelect \
-one of the following safe coding systems, or edit the buffer:\n")
+             (insert (substitute-command-keys "\
+
+Click on a character (or switch to this window by `\\[other-window]'\n\
+and select the characters by RET) to jump to the place it appears,\n\
+where `\\[universal-argument] \\[what-cursor-position]' will give information about it.\n"))))
+         (insert (substitute-command-keys "\nSelect \
+one of the safe coding systems listed below,\n\
+or cancel the writing with \\[keyboard-quit] and edit the buffer\n\
+   to remove or modify the problematic characters,\n\
+or specify any other coding system (and risk losing\n\
+   the problematic characters).\n\n"))
          (let ((pos (point))
                (fill-prefix "  "))
            (dolist (x codings)
              (princ "  ") (princ x))
            (insert "\n")
-           (fill-region-as-paragraph pos (point)))
-         (insert "Or specify any other coding system
-at the risk of losing the problematic characters.\n")))
+           (fill-region-as-paragraph pos (point)))))
 
       ;; Read a coding system.
       (setq coding-system
@@ -2179,7 +2185,7 @@ specifies the character set for the major languages of Western Europe."
     ;; en_IN -- fx.
     ("en_IN" "English" utf-8) ; glibc uses utf-8 for English in India
     ("en" "English" iso-8859-1) ; English
-    ("eo" . "Latin-3") ; Esperanto
+    ("eo" . "Esperanto") ; Esperanto
     ("es" "Spanish" iso-8859-1)
     ("et" . "Latin-1") ; Estonian
     ("eu" . "Latin-1") ; Basque
@@ -2597,6 +2603,9 @@ See also `locale-charset-language-names', `locale-language-names',
                   (not (coding-system-equal coding-system
                                             locale-coding-system)))
          (prefer-coding-system coding-system)
+         ;; Fixme: perhaps prefer-coding-system should set this too.
+         ;; But it's not the time to do such a fundamental change.
+         (setq default-sendmail-coding-system coding-system)
          (setq locale-coding-system coding-system))))
 
     ;; On Windows, override locale-coding-system,