2 files changed, 16 insertions, 8 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b3c5121189e..990527f0586 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-03  Eli Zaretskii  <eliz@is.elta.co.il>
+
+        * international/mule-cmds.el (select-safe-coding-system): Make
+        the message text about selecting a safe coding system more clear.
+
 2000-08-02  Gerd Moellmann  <gerd@gnu.org>
 
         * hi-lock.el: New file.
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 4624fba6fe4..334860b018e 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -587,21 +587,24 @@ and TO is ignored."
             (with-output-to-temp-buffer "*Warning*"
               (save-excursion
                 (set-buffer standard-output)
-                (insert "The following default coding systems were tried,\n"
-                        (if (consp coding-system)
-                            (format "and %s safely encodes the target text:\n"
-                                    (car coding-system))
-                          "but none of them safely encode the target text:\n"))
+                (insert "The following default coding systems were tried:\n")
                 (let ((pos (point))
                       (fill-prefix "  "))
                   (mapcar (function (lambda (x) (princ "  ") (princ (car x))))
                           default-coding-system)
                   (insert "\n")
                   (fill-region-as-paragraph pos (point)))
+                (insert
+                 (if (consp coding-system)
+                     (concat (format "%s safely encodes the target text,\n"
+                                     (car coding-system))
+                             "but it is not recommended for encoding text in this context,\n"
+                             "e.g., for sending an email message.\n")
+                   "However, none of them safely encodes the target text.\n"))
                 (insert (if (consp coding-system)
-                            "Select it or "
-                          "Select ")
-                        "one from the following safe coding systems:\n")
+                            "\nSelect the above, or "
+                          "\nSelect ")
+                        "one of the following safe coding systems:\n")
                 (let ((pos (point))
                       (fill-prefix "  "))
                   (mapcar (function (lambda (x) (princ "  ") (princ x)))