aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2011-05-22 15:05:14 -0400
committerChong Yidong2011-05-22 15:05:14 -0400
commit313f790eb72258ec818e2bdac6ebf5bbcebc4302 (patch)
treec0c53479429644adc07efa9c64d9da5e3aa9d393
parent9c848d8a7578d84212bac6559681fd0cf795581c (diff)
downloademacs-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/ChangeLog5
-rw-r--r--doc/emacs/mule.texi47
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 @@
12011-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
12011-05-18 Glenn Morris <rgm@gnu.org> 62011-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
919reread the file using the correct coding system by typing @kbd{C-x 919reread 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
921Emacs actually used to decode the file, look at the coding system 921prompts for the coding system to use. To see what coding system Emacs
922mnemonic letter near the left edge of the mode line (@pxref{Mode 922actually used to decode the file, look at the coding system mnemonic
923Line}), or type @kbd{C-h C @key{RET}}. 923letter near the left edge of the mode line (@pxref{Mode Line}), or
924type @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}
997Use coding system @var{coding} for saving or revisiting the visited 998Use coding system @var{coding} to save or revisit the visited file in
998file in the current buffer. 999the 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}
1001Specify coding system @var{coding} for the immediately following 1002Specify coding system @var{coding} for the immediately following
1002command. 1003command (@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}
1005Revisit the current file using the coding system @var{coding}. 1006Revisit 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}
1008Convert a region that was decoded using coding system @var{wrong}, 1010Convert 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}
1086Use coding system @var{coding} for transferring selections to and from 1088Use coding system @var{coding} for transferring selections to and from
1087other window-based applications. 1089other 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}
1090Use coding system @var{coding} for transferring @emph{one} 1092Use coding system @var{coding} for transferring @emph{one}
1091selection---the next one---to or from another window-based application. 1093selection---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}
1094Use coding systems @var{input-coding} and @var{output-coding} for 1097Use coding systems @var{input-coding} and @var{output-coding} for
1095subprocess input and output in the current buffer. 1098subprocess 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}
1098Specify coding system @var{coding} for the immediately following
1099command.
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
1134and from a particular subprocess by giving the command in the 1134and from a particular subprocess by giving the command in the
1135corresponding buffer. 1135corresponding 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}
1138runs or starts a subprocess, to specify the coding system to use for 1138(@code{universal-coding-system-argument}) just before the command that
1139communication with that subprocess. 1139runs or starts a subprocess, to specify the coding system for
1140communicating 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
1142current language environment. 1143current 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}
1162Use coding system @var{coding} for encoding and decoding file 1163Use 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}
1208Use coding system @var{coding} for keyboard input. 1209Use 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}
1211Use coding system @var{coding} for terminal output. 1213Use 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