aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2006-12-27 13:19:19 +0000
committerEli Zaretskii2006-12-27 13:19:19 +0000
commit3fc0b26e75b8fa5aeaf11dc608b21b8e7fe7af15 (patch)
tree65580b2bbb5955eb6b5f97b756c4fd4aea23533c
parente7379492d077d91ea2a6b6daefa37eefce91352e (diff)
downloademacs-3fc0b26e75b8fa5aeaf11dc608b21b8e7fe7af15.tar.gz
emacs-3fc0b26e75b8fa5aeaf11dc608b21b8e7fe7af15.zip
(select-safe-coding-system-interactively): Improve the message in the
*Warning* buffer.
-rw-r--r--lisp/international/mule-cmds.el23
1 files changed, 12 insertions, 11 deletions
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index aacce1b4190..b813a6f4943 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -737,18 +737,18 @@ DEFAULT is the coding system to use by default in the query."
737 (insert "\n") 737 (insert "\n")
738 (fill-region-as-paragraph pos (point))) 738 (fill-region-as-paragraph pos (point)))
739 (when rejected 739 (when rejected
740 (insert "These safely encodes the target text, 740 (insert "These safely encode the text in the buffer,
741but it is not recommended for encoding text in this context, 741but are not recommended for encoding text in this context,
742e.g., for sending an email message.\n ") 742e.g., for sending an email message.\n ")
743 (dolist (x rejected) 743 (dolist (x rejected)
744 (princ " ") (princ x)) 744 (princ " ") (princ x))
745 (insert "\n")) 745 (insert "\n"))
746 (when unsafe 746 (when unsafe
747 (insert (if rejected "And the others" 747 (insert (if rejected "The other coding systems"
748 "However, each of them") 748 "However, each of them")
749 " encountered these problematic characters:\n") 749 " encountered characters it couldn't encode:\n")
750 (dolist (coding unsafe) 750 (dolist (coding unsafe)
751 (insert (format " %s:" (car coding))) 751 (insert (format " %s cannot encode these:" (car coding)))
752 (let ((i 0) 752 (let ((i 0)
753 (func1 753 (func1
754 #'(lambda (bufname pos) 754 #'(lambda (bufname pos)
@@ -790,14 +790,15 @@ e.g., for sending an email message.\n ")
790 (insert "\n")) 790 (insert "\n"))
791 (insert "\ 791 (insert "\
792 792
793Click those characters to jump to the place they appear,\n" 793Click a character to jump to the place it appears,\n"
794 (substitute-command-keys "\ 794 (substitute-command-keys "\
795and there \\[universal-argument] \\[what-cursor-position] will give information about it.\n")))) 795where `\\[universal-argument] \\[what-cursor-position]' will give information about it.\n"))))
796 (insert (substitute-command-keys "\nSelect \ 796 (insert (substitute-command-keys "\nSelect \
797one of the following safe coding systems,\n\ 797one of the safe coding systems listed below,\n\
798or cancel the writing by \\[keyboard-quit] and edit the buffer,\n\ 798or cancel the writing with \\[keyboard-quit] and edit the buffer\n\
799or specify any other coding system at the risk of 799 to remove or modify the problematic characters,\n\
800losing the problematic characters.\n")) 800or specify any other coding system (and risk losing\n\
801 the problematic characters).\n\n"))
801 (let ((pos (point)) 802 (let ((pos (point))
802 (fill-prefix " ")) 803 (fill-prefix " "))
803 (dolist (x codings) 804 (dolist (x codings)