emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/emacs-24 r107826: More small edits for doc/


From: Glenn Morris
Subject: [Emacs-diffs] /srv/bzr/emacs/emacs-24 r107826: More small edits for doc/emacs/mule.texi
Date: Fri, 13 Apr 2012 19:40:49 -0700
User-agent: Bazaar (2.3.1)

------------------------------------------------------------
revno: 107826
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Fri 2012-04-13 19:40:49 -0700
message:
  More small edits for doc/emacs/mule.texi
  
  * doc/emacs/mule.texi (Select Input Method, Coding Systems):
  State command names in kbd tables.
  (Recognize Coding): Add cross-ref.
  (Output Coding): Don't mention message mode in particular.
  (Text Coding, Communication Coding, File Name Coding, Terminal Coding):
  Copyedits.
modified:
  doc/emacs/ChangeLog
  doc/emacs/mule.texi
=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2012-04-13 03:59:27 +0000
+++ b/doc/emacs/ChangeLog       2012-04-14 02:40:49 +0000
@@ -1,3 +1,12 @@
+2012-04-14  Glenn Morris  <address@hidden>
+
+       * mule.texi (Select Input Method, Coding Systems):
+       State command names in kbd tables.
+       (Recognize Coding): Add cross-ref.
+       (Output Coding): Don't mention message mode in particular.
+       (Text Coding, Communication Coding, File Name Coding, Terminal Coding):
+       Copyedits.
+
 2012-04-13  Glenn Morris  <address@hidden>
 
        * mule.texi (Select Input Method, Coding Systems, Recognize Coding):

=== modified file 'doc/emacs/mule.texi'
--- a/doc/emacs/mule.texi       2012-04-13 03:59:27 +0000
+++ b/doc/emacs/mule.texi       2012-04-14 02:40:49 +0000
@@ -577,10 +577,10 @@
 
 @table @kbd
 @item C-\
-Enable or disable use of the selected input method.
+Enable or disable use of the selected input method 
(@code{toggle-input-method}).
 
 @item C-x @key{RET} C-\ @var{method} @key{RET}
-Select a new input method for the current buffer.
+Select a new input method for the current buffer (@code{set-input-method}).
 
 @item C-h I @var{method} @key{RET}
 @itemx C-h C-\ @var{method} @key{RET}
@@ -716,7 +716,7 @@
 
 @table @kbd
 @item C-h C @var{coding} @key{RET}
-Describe coding system @var{coding}.
+Describe coding system @var{coding} (@code{describe-coding-system}).
 
 @item C-h C @key{RET}
 Describe the coding systems currently in use.
@@ -921,7 +921,7 @@
 the strongest way to specify the coding system for certain patterns of
 file names, or for files containing certain patterns, respectively.
 These variables even override @samp{-*-coding:-*-} tags in the file
-itself.  For example, Emacs
+itself (@pxref{Specify Coding}).  For example, Emacs
 uses @code{auto-coding-alist} for tar and archive files, to prevent it
 from being confused by a @samp{-*-coding:-*-} tag in a member of the
 archive and thinking it applies to the archive file as a whole.
@@ -1006,6 +1006,7 @@
 
   If you insert the unsuitable characters in a mail message, Emacs
 behaves a bit differently.  It additionally checks whether the
address@hidden What determines this?
 most-preferred coding system is recommended for use in MIME messages;
 if not, Emacs tells you that the most-preferred coding system is not
 recommended and prompts you for another coding system.  This is so you
@@ -1014,17 +1015,22 @@
 still use an unsuitable coding system if you type its name in response
 to the question.)
 
address@hidden It seems that select-message-coding-system does this.
address@hidden Both sendmail.el and smptmail.el call it; i.e. smtpmail.el still
address@hidden obeys sendmail-coding-system.
 @vindex sendmail-coding-system
-  When you send a message with Message mode (@pxref{Sending Mail}),
+  When you send a mail message (@pxref{Sending Mail}),
 Emacs has four different ways to determine the coding system to use
 for encoding the message text.  It tries the buffer's own value of
 @code{buffer-file-coding-system}, if that is address@hidden
 Otherwise, it uses the value of @code{sendmail-coding-system}, if that
 is address@hidden  The third way is to use the default coding system
 for new files, which is controlled by your choice of language
address@hidden i.e., default-sendmail-coding-system
 environment, if that is address@hidden  If all of these three values
 are @code{nil}, Emacs encodes outgoing mail using the Latin-1 coding
 system.
address@hidden FIXME?  Where does the Latin-1 default come in?
 
 @node Text Coding
 @section Specifying a Coding System for File Text
@@ -1035,8 +1041,8 @@
 
 @table @kbd
 @item C-x @key{RET} f @var{coding} @key{RET}
-Use coding system @var{coding} to save or revisit the visited file in
-the current buffer (@code{set-buffer-file-coding-system})
+Use coding system @var{coding} to save or revisit the file in
+the current buffer (@code{set-buffer-file-coding-system}).
 
 @item C-x @key{RET} c @var{coding} @key{RET}
 Specify coding system @var{coding} for the immediately following
@@ -1066,8 +1072,8 @@
   You can also use this command to specify the end-of-line conversion
 (@pxref{Coding Systems, end-of-line conversion}) for encoding the
 current buffer.  For example, @kbd{C-x @key{RET} f dos @key{RET}} will
-cause Emacs to save the current buffer's text with DOS-style CRLF line
-endings.
+cause Emacs to save the current buffer's text with DOS-style
+carriage-return linefeed line endings.
 
 @kindex C-x RET c
 @findex universal-coding-system-argument
@@ -1155,7 +1161,7 @@
   The variable @code{x-select-request-type} specifies the data type to
 request from the X Window System for receiving text selections from
 other applications.  If the value is @code{nil} (the default), Emacs
-tries @code{COMPOUND_TEXT} and @code{UTF8_STRING}, in this order, and
+tries @code{UTF8_STRING} and @code{COMPOUND_TEXT}, in this order, and
 uses various heuristics to choose the more appropriate of the two
 results; if none of these succeed, Emacs falls back on @code{STRING}.
 If the value of @code{x-select-request-type} is one of the symbols
@@ -1187,8 +1193,8 @@
   The variable @code{locale-coding-system} specifies a coding system
 to use when encoding and decoding system strings such as system error
 messages and @code{format-time-string} formats and time stamps.  That
-coding system is also used for decoding address@hidden keyboard input on X
-Window systems.  You should choose a coding system that is compatible
+coding system is also used for decoding address@hidden keyboard
+input on the X Window System.  You should choose a coding system that is 
compatible
 with the underlying system's text representation, which is normally
 specified by one of the environment variables @env{LC_ALL},
 @env{LC_CTYPE}, and @env{LANG}.  (The first one, in the order
@@ -1201,27 +1207,29 @@
 @table @kbd
 @item C-x @key{RET} F @var{coding} @key{RET}
 Use coding system @var{coding} for encoding and decoding file
address@hidden (@code{set-file-name-coding-system}).
+names (@code{set-file-name-coding-system}).
 @end table
 
address@hidden file-name-coding-system
address@hidden file names with address@hidden characters
-  The variable @code{file-name-coding-system} specifies a coding
-system to use for encoding file names.  It has no effect on reading
-and writing the @emph{contents} of files.
-
 @findex set-file-name-coding-system
 @kindex C-x @key{RET} F
-  If you set the variable to a coding system name (as a Lisp symbol or
-a string), Emacs encodes file names using that coding system for all
-file operations.  This makes it possible to use address@hidden
-characters in file names---or, at least, those address@hidden
-characters which the specified coding system can encode.  Use @kbd{C-x
address@hidden F} (@code{set-file-name-coding-system}) to specify this
-interactively.
address@hidden file names with address@hidden characters
+  The command @kbd{C-x @key{RET} F} (@code{set-file-name-coding-system})
+specifies a coding system to use for encoding file @emph{names}.  It
+has no effect on reading and writing the @emph{contents} of files.
+
address@hidden file-name-coding-system
+  In fact, all this command does is set the value of the variable
address@hidden  If you set the variable to a coding
+system name (as a Lisp symbol or a string), Emacs encodes file names
+using that coding system for all file operations.  This makes it
+possible to use address@hidden characters in file names---or, at
+least, those address@hidden characters that the specified coding
+system can encode.
 
   If @code{file-name-coding-system} is @code{nil}, Emacs uses a
-default coding system determined by the selected language environment.
+default coding system determined by the selected language environment,
+and stored in the @code{default-file-name-coding-system} variable.
address@hidden FIXME?  Is this correct?  What is the "default language 
environment"?
 In the default language environment, address@hidden characters in
 file names are not encoded specially; they appear in the file system
 using the internal Emacs representation.
@@ -1232,7 +1240,7 @@
 the earlier coding system and cannot be encoded (or are encoded
 differently) under the new coding system.  If you try to save one of
 these buffers under the visited file name, saving may use the wrong file
-name, or it may get an error.  If such a problem happens, use @kbd{C-x
+name, or it may encounter an error.  If such a problem happens, use @kbd{C-x
 C-w} to specify a new file name for that buffer.
 
 @findex recode-file-name
@@ -1245,13 +1253,13 @@
 @section Coding Systems for Terminal I/O
 
 @table @kbd
address@hidden C-x @key{RET} t @var{coding} @key{RET}
+Use coding system @var{coding} for terminal output
+(@code{set-terminal-coding-system}).
+
 @item C-x @key{RET} k @var{coding} @key{RET}
 Use coding system @var{coding} for keyboard input
 (@code{set-keyboard-coding-system}).
-
address@hidden C-x @key{RET} t @var{coding} @key{RET}
-Use coding system @var{coding} for terminal output
-(@code{set-terminal-coding-system}).
 @end table
 
 @kindex C-x RET t
@@ -1274,8 +1282,8 @@
 @kindex C-x RET k
 @findex set-keyboard-coding-system
 @vindex keyboard-coding-system
-  The command @kbd{C-x @key{RET} k} (@code{set-keyboard-coding-system})
-or the variable @code{keyboard-coding-system} specifies the coding
+  The command @kbd{C-x @key{RET} k} (@code{set-keyboard-coding-system}),
+or the variable @code{keyboard-coding-system}, specifies the coding
 system for keyboard input.  Character-code translation of keyboard
 input is useful for terminals with keys that send address@hidden
 graphic characters---for example, some terminals designed for ISO


reply via email to

[Prev in Thread] Current Thread [Next in Thread]