diff options
| -rw-r--r-- | doc/emacs/ChangeLog | 2 | ||||
| -rw-r--r-- | doc/emacs/mule.texi | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 94d3afc7c72..0f3f13ee829 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2012-05-03 Glenn Morris <rgm@gnu.org> | 1 | 2012-05-03 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * mule.texi (Output Coding): Reword to improve page-breaks. | ||
| 4 | |||
| 3 | * frames.texi (Fonts): Tweak line and page breaks. | 5 | * frames.texi (Fonts): Tweak line and page breaks. |
| 4 | Use example rather than smallexample. Change cross-reference. | 6 | Use example rather than smallexample. Change cross-reference. |
| 5 | (Text-Only Mouse): Fix xref. | 7 | (Text-Only Mouse): Fix xref. |
diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi index cffcb7573ff..b0b35bf14b5 100644 --- a/doc/emacs/mule.texi +++ b/doc/emacs/mule.texi | |||
| @@ -991,12 +991,11 @@ and asks you to choose one of those coding systems. | |||
| 991 | behaves a bit differently. It additionally checks whether the | 991 | behaves a bit differently. It additionally checks whether the |
| 992 | @c What determines this? | 992 | @c What determines this? |
| 993 | most-preferred coding system is recommended for use in MIME messages; | 993 | most-preferred coding system is recommended for use in MIME messages; |
| 994 | if not, Emacs tells you that the most-preferred coding system is not | 994 | if not, it informs you of this fact and prompts you for another coding |
| 995 | recommended and prompts you for another coding system. This is so you | 995 | system. This is so you won't inadvertently send a message encoded in |
| 996 | won't inadvertently send a message encoded in a way that your | 996 | a way that your recipient's mail software will have difficulty |
| 997 | recipient's mail software will have difficulty decoding. (You can | 997 | decoding. (You can still use an unsuitable coding system if you enter |
| 998 | still use an unsuitable coding system if you type its name in response | 998 | its name at the prompt.) |
| 999 | to the question.) | ||
| 1000 | 999 | ||
| 1001 | @c It seems that select-message-coding-system does this. | 1000 | @c It seems that select-message-coding-system does this. |
| 1002 | @c Both sendmail.el and smptmail.el call it; i.e. smtpmail.el still | 1001 | @c Both sendmail.el and smptmail.el call it; i.e. smtpmail.el still |