Merge from gnus--rel--5.10

[gnu-emacs] / man / mule.texi

diff --git a/man/mule.texi b/man/mule.texi
index 9cd2995502a704f480898df2057cf090cfcf48bf..3e7a35d246a82507d577eb57d993fce353958995 100644 (file)
--- a/man/mule.texi
+++ b/man/mule.texi
@@ -212,11 +212,13 @@ always load any particular Lisp file in the same way.  However, you can
 load a Lisp file as unibyte, on any one occasion, by typing @kbd{C-x
 @key{RET} c raw-text @key{RET}} immediately before loading it.
 
-  The mode line indicates whether multibyte character support is enabled
-in the current buffer.  If it is, there are two or more characters (most
-often two dashes) before the colon near the beginning of the mode line.
-When multibyte characters are not enabled, nothing precedes the colon
-except a single dash.
+  The mode line indicates whether multibyte character support is
+enabled in the current buffer.  If it is, there are two or more
+characters (most often two dashes) near the beginning of the mode
+line, before the indication of the visited file's end-of-line
+convention (colon, backslash, etc.).  When multibyte characters
+are not enabled, nothing precedes the colon except a single dash.
+@xref{Mode Line}, for more details about this.
 
 @node Language Environments
 @section Language Environments
@@ -721,6 +723,7 @@ handles end-of-line conversion based on the data encountered, and has
 the usual three variants to specify the kind of end-of-line conversion.
 
 @findex unify-8859-on-decoding-mode
+@anchor{Character Translation} 
   The @dfn{character translation} feature can modify the effect of
 various coding systems, by changing the internal Emacs codes that
 decoding produces.  For instance, the command
@@ -784,7 +787,7 @@ file.  The variable @code{file-coding-system-alist} specifies this
 correspondence.  There is a special function
 @code{modify-coding-system-alist} for adding elements to this list.  For
 example, to read and write all @samp{.txt} files using the coding system
-@code{china-iso-8bit}, you can execute this Lisp expression:
+@code{chinese-iso-8bit}, you can execute this Lisp expression:
 
 @smallexample
 (modify-coding-system-alist 'file "\\.txt\\'" 'chinese-iso-8bit)
@@ -885,12 +888,11 @@ the coding explicitly in the file, that overrides
 @code{file-coding-system-alist}.
 
   If you add the character @samp{!} at the end of the coding system
-name in @code{coding}, it disables any character translation while
-decoding the file.  For instance, it effectively cancels the effect of
-@code{unify-8859-on-decoding-mode}.  This is useful when you need to
-make sure that the character codes in the Emacs buffer will not vary
-due to changes in user settings; for instance, for the sake of strings
-in Emacs Lisp source files.
+name in @code{coding}, it disables any character translation
+(@pxref{Character Translation}) while decoding the file.  This is
+useful when you need to make sure that the character codes in the
+Emacs buffer will not vary due to changes in user settings; for
+instance, for the sake of strings in Emacs Lisp source files.
 
 @node Output Coding
 @section Choosing Coding Systems for Output
@@ -1003,7 +1005,7 @@ of with @kbd{C-x @key{RET} f}, there is no warning if the buffer
 contains characters that the coding system cannot handle.
 
   Other file commands affected by a specified coding system include
-@kbd{C-x C-i} and @kbd{C-x C-v}, as well as the other-window variants
+@kbd{C-x i} and @kbd{C-x C-v}, as well as the other-window variants
 of @kbd{C-x C-f}.  @kbd{C-x @key{RET} c} also affects commands that
 start subprocesses, including @kbd{M-x shell} (@pxref{Shell}).  If the
 immediately following command does not use the coding system, then
@@ -1302,7 +1304,7 @@ menus cannot handle fontsets.
 The resource value should have this form:
 
 @smallexample
-@var{fontpattern}, @r{[}@var{charsetname}:@var{fontname}@r{]@dots{}}
+@var{fontpattern}, @r{[}@var{charset}:@var{font}@r{]@dots{}}
 @end smallexample
 
 @noindent