diff options
| author | Chong Yidong | 2011-05-22 15:05:14 -0400 |
|---|---|---|
| committer | Chong Yidong | 2011-05-22 15:05:14 -0400 |
| commit | 313f790eb72258ec818e2bdac6ebf5bbcebc4302 (patch) | |
| tree | c0c53479429644adc07efa9c64d9da5e3aa9d393 | |
| parent | 9c848d8a7578d84212bac6559681fd0cf795581c (diff) | |
| download | emacs-313f790eb72258ec818e2bdac6ebf5bbcebc4302.tar.gz emacs-313f790eb72258ec818e2bdac6ebf5bbcebc4302.zip | |
Doc fixes for mule.texi.
* mule.texi (Specify Coding, Text Coding, Communication Coding):
(File Name Coding, Terminal Coding): Add command names (Bug#8312).
| -rw-r--r-- | doc/emacs/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/emacs/mule.texi | 47 |
2 files changed, 30 insertions, 22 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 1f236ef4206..2bf07904172 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-05-22 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * mule.texi (Specify Coding, Text Coding, Communication Coding): | ||
| 4 | (File Name Coding, Terminal Coding): Add command names (Bug#8312). | ||
| 5 | |||
| 1 | 2011-05-18 Glenn Morris <rgm@gnu.org> | 6 | 2011-05-18 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * ack.texi (Acknowledgments): Remove fakemail.c. | 8 | * ack.texi (Acknowledgments): Remove fakemail.c. |
diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi index 1a4d0d33bc6..a721e0c204b 100644 --- a/doc/emacs/mule.texi +++ b/doc/emacs/mule.texi | |||
| @@ -916,11 +916,12 @@ written in the Emacs internal character code). | |||
| 916 | @section Specifying a File's Coding System | 916 | @section Specifying a File's Coding System |
| 917 | 917 | ||
| 918 | If Emacs recognizes the encoding of a file incorrectly, you can | 918 | If Emacs recognizes the encoding of a file incorrectly, you can |
| 919 | reread the file using the correct coding system by typing @kbd{C-x | 919 | reread the file using the correct coding system with @kbd{C-x |
| 920 | @key{RET} r @var{coding-system} @key{RET}}. To see what coding system | 920 | @key{RET} r} (@code{revert-buffer-with-coding-system}). This command |
| 921 | Emacs actually used to decode the file, look at the coding system | 921 | prompts for the coding system to use. To see what coding system Emacs |
| 922 | mnemonic letter near the left edge of the mode line (@pxref{Mode | 922 | actually used to decode the file, look at the coding system mnemonic |
| 923 | Line}), or type @kbd{C-h C @key{RET}}. | 923 | letter near the left edge of the mode line (@pxref{Mode Line}), or |
| 924 | type @kbd{C-h C} (@code{describe-coding-system}). | ||
| 924 | 925 | ||
| 925 | @vindex coding | 926 | @vindex coding |
| 926 | You can specify the coding system for a particular file in the file | 927 | You can specify the coding system for a particular file in the file |
| @@ -994,15 +995,16 @@ one: | |||
| 994 | 995 | ||
| 995 | @table @kbd | 996 | @table @kbd |
| 996 | @item C-x @key{RET} f @var{coding} @key{RET} | 997 | @item C-x @key{RET} f @var{coding} @key{RET} |
| 997 | Use coding system @var{coding} for saving or revisiting the visited | 998 | Use coding system @var{coding} to save or revisit the visited file in |
| 998 | file in the current buffer. | 999 | the current buffer (@code{set-buffer-file-coding-system}) |
| 999 | 1000 | ||
| 1000 | @item C-x @key{RET} c @var{coding} @key{RET} | 1001 | @item C-x @key{RET} c @var{coding} @key{RET} |
| 1001 | Specify coding system @var{coding} for the immediately following | 1002 | Specify coding system @var{coding} for the immediately following |
| 1002 | command. | 1003 | command (@code{universal-coding-system-argument}). |
| 1003 | 1004 | ||
| 1004 | @item C-x @key{RET} r @var{coding} @key{RET} | 1005 | @item C-x @key{RET} r @var{coding} @key{RET} |
| 1005 | Revisit the current file using the coding system @var{coding}. | 1006 | Revisit the current file using the coding system @var{coding} |
| 1007 | (@code{revert-buffer-with-coding-system}). | ||
| 1006 | 1008 | ||
| 1007 | @item M-x recode-region @key{RET} @var{right} @key{RET} @var{wrong} @key{RET} | 1009 | @item M-x recode-region @key{RET} @var{right} @key{RET} @var{wrong} @key{RET} |
| 1008 | Convert a region that was decoded using coding system @var{wrong}, | 1010 | Convert a region that was decoded using coding system @var{wrong}, |
| @@ -1084,19 +1086,17 @@ in communication with other processes. | |||
| 1084 | @table @kbd | 1086 | @table @kbd |
| 1085 | @item C-x @key{RET} x @var{coding} @key{RET} | 1087 | @item C-x @key{RET} x @var{coding} @key{RET} |
| 1086 | Use coding system @var{coding} for transferring selections to and from | 1088 | Use coding system @var{coding} for transferring selections to and from |
| 1087 | other window-based applications. | 1089 | other window-based applications (@code{set-selection-coding-system}). |
| 1088 | 1090 | ||
| 1089 | @item C-x @key{RET} X @var{coding} @key{RET} | 1091 | @item C-x @key{RET} X @var{coding} @key{RET} |
| 1090 | Use coding system @var{coding} for transferring @emph{one} | 1092 | Use coding system @var{coding} for transferring @emph{one} |
| 1091 | selection---the next one---to or from another window-based application. | 1093 | selection---the next one---to or from another window-based application |
| 1094 | (@code{set-next-selection-coding-system}). | ||
| 1092 | 1095 | ||
| 1093 | @item C-x @key{RET} p @var{input-coding} @key{RET} @var{output-coding} @key{RET} | 1096 | @item C-x @key{RET} p @var{input-coding} @key{RET} @var{output-coding} @key{RET} |
| 1094 | Use coding systems @var{input-coding} and @var{output-coding} for | 1097 | Use coding systems @var{input-coding} and @var{output-coding} for |
| 1095 | subprocess input and output in the current buffer. | 1098 | subprocess input and output in the current buffer |
| 1096 | 1099 | (@code{set-buffer-process-coding-system}). | |
| 1097 | @item C-x @key{RET} c @var{coding} @key{RET} | ||
| 1098 | Specify coding system @var{coding} for the immediately following | ||
| 1099 | command. | ||
| 1100 | @end table | 1100 | @end table |
| 1101 | 1101 | ||
| 1102 | @kindex C-x RET x | 1102 | @kindex C-x RET x |
| @@ -1134,9 +1134,10 @@ own buffer, and thus you can use this command to specify translation to | |||
| 1134 | and from a particular subprocess by giving the command in the | 1134 | and from a particular subprocess by giving the command in the |
| 1135 | corresponding buffer. | 1135 | corresponding buffer. |
| 1136 | 1136 | ||
| 1137 | You can also use @kbd{C-x @key{RET} c} just before the command that | 1137 | You can also use @kbd{C-x @key{RET} c} |
| 1138 | runs or starts a subprocess, to specify the coding system to use for | 1138 | (@code{universal-coding-system-argument}) just before the command that |
| 1139 | communication with that subprocess. | 1139 | runs or starts a subprocess, to specify the coding system for |
| 1140 | communicating with that subprocess. @xref{Text Coding}. | ||
| 1140 | 1141 | ||
| 1141 | The default for translation of process input and output depends on the | 1142 | The default for translation of process input and output depends on the |
| 1142 | current language environment. | 1143 | current language environment. |
| @@ -1160,7 +1161,7 @@ the text representation.) | |||
| 1160 | @table @kbd | 1161 | @table @kbd |
| 1161 | @item C-x @key{RET} F @var{coding} @key{RET} | 1162 | @item C-x @key{RET} F @var{coding} @key{RET} |
| 1162 | Use coding system @var{coding} for encoding and decoding file | 1163 | Use coding system @var{coding} for encoding and decoding file |
| 1163 | @emph{names}. | 1164 | @emph{names} (@code{set-file-name-coding-system}). |
| 1164 | @end table | 1165 | @end table |
| 1165 | 1166 | ||
| 1166 | @vindex file-name-coding-system | 1167 | @vindex file-name-coding-system |
| @@ -1205,10 +1206,12 @@ system, and the coding system to which you wish to convert. | |||
| 1205 | 1206 | ||
| 1206 | @table @kbd | 1207 | @table @kbd |
| 1207 | @item C-x @key{RET} k @var{coding} @key{RET} | 1208 | @item C-x @key{RET} k @var{coding} @key{RET} |
| 1208 | Use coding system @var{coding} for keyboard input. | 1209 | Use coding system @var{coding} for keyboard input |
| 1210 | (@code{set-keyboard-coding-system}). | ||
| 1209 | 1211 | ||
| 1210 | @item C-x @key{RET} t @var{coding} @key{RET} | 1212 | @item C-x @key{RET} t @var{coding} @key{RET} |
| 1211 | Use coding system @var{coding} for terminal output. | 1213 | Use coding system @var{coding} for terminal output |
| 1214 | (@code{set-terminal-coding-system}). | ||
| 1212 | @end table | 1215 | @end table |
| 1213 | 1216 | ||
| 1214 | @kindex C-x RET t | 1217 | @kindex C-x RET t |