aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2000-08-03 11:38:08 +0000
committerEli Zaretskii2000-08-03 11:38:08 +0000
commit2f1fa038c8fabf10386d6b8c451cf66d0ad408e5 (patch)
treeab6e5a5894dca747bc0b877d37bf469e346d5b94
parentabb2db1cf3b6505afedcafb51e6f8dca36585b9c (diff)
downloademacs-2f1fa038c8fabf10386d6b8c451cf66d0ad408e5.tar.gz
emacs-2f1fa038c8fabf10386d6b8c451cf66d0ad408e5.zip
(select-safe-coding-system): Make
the message text about selecting a safe coding system more clear.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/international/mule-cmds.el19
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 @@
12000-08-03 Eli Zaretskii <eliz@is.elta.co.il>
2
3 * international/mule-cmds.el (select-safe-coding-system): Make
4 the message text about selecting a safe coding system more clear.
5
12000-08-02 Gerd Moellmann <gerd@gnu.org> 62000-08-02 Gerd Moellmann <gerd@gnu.org>
2 7
3 * hi-lock.el: New file. 8 * 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."
587 (with-output-to-temp-buffer "*Warning*" 587 (with-output-to-temp-buffer "*Warning*"
588 (save-excursion 588 (save-excursion
589 (set-buffer standard-output) 589 (set-buffer standard-output)
590 (insert "The following default coding systems were tried,\n" 590 (insert "The following default coding systems were tried:\n")
591 (if (consp coding-system)
592 (format "and %s safely encodes the target text:\n"
593 (car coding-system))
594 "but none of them safely encode the target text:\n"))
595 (let ((pos (point)) 591 (let ((pos (point))
596 (fill-prefix " ")) 592 (fill-prefix " "))
597 (mapcar (function (lambda (x) (princ " ") (princ (car x)))) 593 (mapcar (function (lambda (x) (princ " ") (princ (car x))))
598 default-coding-system) 594 default-coding-system)
599 (insert "\n") 595 (insert "\n")
600 (fill-region-as-paragraph pos (point))) 596 (fill-region-as-paragraph pos (point)))
597 (insert
598 (if (consp coding-system)
599 (concat (format "%s safely encodes the target text,\n"
600 (car coding-system))
601 "but it is not recommended for encoding text in this context,\n"
602 "e.g., for sending an email message.\n")
603 "However, none of them safely encodes the target text.\n"))
601 (insert (if (consp coding-system) 604 (insert (if (consp coding-system)
602 "Select it or " 605 "\nSelect the above, or "
603 "Select ") 606 "\nSelect ")
604 "one from the following safe coding systems:\n") 607 "one of the following safe coding systems:\n")
605 (let ((pos (point)) 608 (let ((pos (point))
606 (fill-prefix " ")) 609 (fill-prefix " "))
607 (mapcar (function (lambda (x) (princ " ") (princ x))) 610 (mapcar (function (lambda (x) (princ " ") (princ x)))