diff options
| author | Kenichi Handa | 2006-12-27 01:25:31 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2006-12-27 01:25:31 +0000 |
| commit | 7d03c5b15dd52ca04c95d443c89fb1760f177eb9 (patch) | |
| tree | f955cd02373b4c1363409f97cde10403b6f2cb27 | |
| parent | 39449da0b446431f7d0e201318d51f11a576c47e (diff) | |
| download | emacs-7d03c5b15dd52ca04c95d443c89fb1760f177eb9.tar.gz emacs-7d03c5b15dd52ca04c95d443c89fb1760f177eb9.zip | |
(select-safe-coding-system-interactively):
Improve the message in *Warning* buffer.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/international/mule-cmds.el | 14 |
2 files changed, 13 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b3c47a63eb8..81f19cbff69 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2006-12-27 Kenichi Handa <handa@m17n.org> | ||
| 2 | |||
| 3 | * international/mule-cmds.el (select-safe-coding-system-interactively): | ||
| 4 | Improve the message in *Warning* buffer. | ||
| 5 | |||
| 1 | 2006-12-27 Kim F. Storm <storm@cua.dk> | 6 | 2006-12-27 Kim F. Storm <storm@cua.dk> |
| 2 | 7 | ||
| 3 | * ido.el (ido-set-matches-1): Never put current buffer first if | 8 | * ido.el (ido-set-matches-1): Never put current buffer first if |
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index 4b415baf5fa..e558b49df4c 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el | |||
| @@ -787,19 +787,21 @@ e.g., for sending an email message.\n ") | |||
| 787 | (setq i (1+ i)))) | 787 | (setq i (1+ i)))) |
| 788 | (insert "\n")) | 788 | (insert "\n")) |
| 789 | (insert "\ | 789 | (insert "\ |
| 790 | The first problematic character is at point in the displayed buffer,\n" | 790 | |
| 791 | Click those characters to jump to the place they appear,\n" | ||
| 791 | (substitute-command-keys "\ | 792 | (substitute-command-keys "\ |
| 792 | and \\[universal-argument] \\[what-cursor-position] will give information about it.\n")))) | 793 | and \\[universal-argument] \\[what-cursor-position] will give information about it.\n")))) |
| 793 | (insert "\nSelect \ | 794 | (insert (substitute-command-keys "\nSelect \ |
| 794 | one of the following safe coding systems, or edit the buffer:\n") | 795 | one of the following safe coding systems,\n\ |
| 796 | or cancel the writing by \\[keyboard-quit] and edit the buffer,\n\ | ||
| 797 | or specify any other coding system at the risk of | ||
| 798 | losing the problematic characters.\n")) | ||
| 795 | (let ((pos (point)) | 799 | (let ((pos (point)) |
| 796 | (fill-prefix " ")) | 800 | (fill-prefix " ")) |
| 797 | (dolist (x codings) | 801 | (dolist (x codings) |
| 798 | (princ " ") (princ x)) | 802 | (princ " ") (princ x)) |
| 799 | (insert "\n") | 803 | (insert "\n") |
| 800 | (fill-region-as-paragraph pos (point))) | 804 | (fill-region-as-paragraph pos (point))))) |
| 801 | (insert "Or specify any other coding system | ||
| 802 | at the risk of losing the problematic characters.\n"))) | ||
| 803 | 805 | ||
| 804 | ;; Read a coding system. | 806 | ;; Read a coding system. |
| 805 | (setq coding-system | 807 | (setq coding-system |