[Emacs-diffs] /srv/bzr/emacs/emacs-24 r107814: Doc and manual fixes related to mule

[Glenn Morris]

------------------------------------------------------------
revno: 107814
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Wed 2012-04-11 21:09:15 -0400
message:
  Doc and manual fixes related to mule
  
  * doc/emacs/mule.texi (International): Copyedits.
  (International Chars): Update C-x = example output.
  (Disabling Multibyte): Rename from "Enabling Multibyte".
  Clarify what "unibyte: t" does, and mode-line description.
  (Unibyte Mode): Update for "Disabling Multibyte" node name change.
  Use Texinfo recommended convention for quotes+punctuation.
  
  * doc/emacs/custom.texi (Specifying File Variables):
  Fix "unibyte" description.
  Update for "Disabling Multibyte" node name change.
  
  * doc/emacs/emacs.texi: Update for "Disabling Multibyte" node name change.
  
  * doc/lispref/loading.texi (Loading Non-ASCII):
  "unibyte:" can also be at the end.
  
  * lisp/international/mule.el (set-auto-coding-for-load): Doc fix.
modified:
  doc/emacs/ChangeLog
  doc/emacs/custom.texi
  doc/emacs/emacs.texi
  doc/emacs/mule.texi
  doc/lispref/ChangeLog
  doc/lispref/loading.texi
  lisp/ChangeLog
  lisp/international/mule.el

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2012-04-10 06:54:43 +0000
+++ b/doc/emacs/ChangeLog       2012-04-12 01:09:15 +0000
@@ -1,3 +1,15 @@
+2012-04-12  Glenn Morris  <address@hidden>
+
+       * mule.texi (International): Copyedits.
+       (International Chars): Update C-x = example output.
+       (Disabling Multibyte): Rename from "Enabling Multibyte".
+       Clarify what "unibyte: t" does, and mode-line description.
+       (Unibyte Mode): Update for "Disabling Multibyte" node name change.
+       Use Texinfo recommended convention for quotes+punctuation.
+       * custom.texi (Specifying File Variables):  Fix "unibyte" description.
+       Update for "Disabling Multibyte" node name change.
+       * emacs.texi: Update for "Disabling Multibyte" node name change.
+
 2012-04-10  Glenn Morris  <address@hidden>
 
        * abbrevs.texi, arevert-xtra.texi, buffers.texi, building.texi:

=== modified file 'doc/emacs/custom.texi'
--- a/doc/emacs/custom.texi     2012-04-10 06:54:43 +0000
+++ b/doc/emacs/custom.texi     2012-04-12 01:09:15 +0000
@@ -1163,8 +1163,8 @@
 conversion of this file.  @xref{Coding Systems}.
 
 @item
address@hidden says to visit the file in a unibyte buffer, if the
-value is @code{t}.  @xref{Enabling Multibyte}.
address@hidden says to load or compile a file of Emacs Lisp in unibyte
+mode, if the value is @code{t}.  @xref{Disabling Multibyte}.
 @end itemize
 
 @noindent

=== modified file 'doc/emacs/emacs.texi'
--- a/doc/emacs/emacs.texi      2012-02-29 08:11:23 +0000
+++ b/doc/emacs/emacs.texi      2012-04-12 01:09:15 +0000
@@ -516,7 +516,7 @@
 International Character Set Support
 
 * International Chars::     Basic concepts of multibyte characters.
-* Enabling Multibyte::      Controlling whether to use multibyte characters.
+* Disabling Multibyte::     Controlling whether to use multibyte characters.
 * Language Environments::   Setting things up for the language you use.
 * Input Methods::           Entering text characters not on your keyboard.
 * Select Input Method::     Specifying your choice of input methods.

=== modified file 'doc/emacs/mule.texi'
--- a/doc/emacs/mule.texi       2012-03-16 23:20:37 +0000
+++ b/doc/emacs/mule.texi       2012-04-12 01:09:15 +0000
@@ -41,7 +41,7 @@
 well as Cyrillic, Devanagari (for Hindi and Marathi), Ethiopic, Greek,
 Han (for Chinese and Japanese), Hangul (for Korean), Hebrew, IPA,
 Kannada, Lao, Malayalam, Tamil, Thai, Tibetan, and Vietnamese scripts.
-Emacs also supports various encodings of these characters used by
+Emacs also supports various encodings of these characters that are used by
 other internationalized software, such as word processors and mailers.
 
   Emacs allows editing text with international characters by supporting
@@ -74,14 +74,14 @@
 @item
 You can insert address@hidden characters or search for them.  To do that,
 you can specify an input method (@pxref{Select Input Method}) suitable
-for your language, or use the default input method set up when you set
+for your language, or use the default input method set up when you chose
 your language environment.  If
 your keyboard can produce address@hidden characters, you can select an
 appropriate keyboard coding system (@pxref{Terminal Coding}), and Emacs
 will accept those characters.  Latin-1 characters can also be input by
 using the @kbd{C-x 8} prefix, see @ref{Unibyte Mode}.
 
-On the X Window System, your locale should be set to an appropriate
+With the X Window System, your locale should be set to an appropriate
 value to make sure Emacs interprets keyboard input correctly; see
 @ref{Language Environments, locales}.
 @end itemize
@@ -90,7 +90,7 @@
 
 @menu
 * International Chars::     Basic concepts of multibyte characters.
-* Enabling Multibyte::      Controlling whether to use multibyte characters.
+* Disabling Multibyte::     Controlling whether to use multibyte characters.
 * Language Environments::   Setting things up for the language you use.
 * Input Methods::           Entering text characters not on your keyboard.
 * Select Input Method::     Specifying your choice of input methods.
@@ -224,29 +224,30 @@
 in a buffer whose coding system is @code{utf-8-unix}:
 
 @smallexample
-        character: @`A (192, #o300, #xc0)
-preferred charset: unicode (Unicode (ISO10646))
-       code point: 0xC0
-           syntax: w    which means: word
-         category: j:Japanese l:Latin v:Vietnamese
-      buffer code: #xC3 #x80
-        file code: not encodable by coding system undecided-unix
-          display: by this font (glyph code)
+             position: 1 of 1 (0%), column: 0
+            character: @`A (displayed as @`A) (codepoint 192, #o300, #xc0)
+    preferred charset: unicode (Unicode (ISO10646))
+code point in charset: 0xC0
+               syntax: w       which means: word
+             category: .:Base, L:Left-to-right (strong),
+                       j:Japanese, l:Latin, v:Viet
+          buffer code: #xC3 #x80
+            file code: not encodable by coding system undecided-unix
+              display: by this font (glyph code)
     xft:-unknown-DejaVu Sans Mono-normal-normal-
         normal-*-13-*-*-*-m-0-iso10646-1 (#x82)
 
 Character code properties: customize what to show
   name: LATIN CAPITAL LETTER A WITH GRAVE
+  old-name: LATIN CAPITAL LETTER A GRAVE
   general-category: Lu (Letter, Uppercase)
   decomposition: (65 768) ('A' '`')
-  old-name: LATIN CAPITAL LETTER A GRAVE
-
-There are text properties here:
-  auto-composed        t
 @end smallexample
 
address@hidden Enabling Multibyte
address@hidden Enabling Multibyte Characters
address@hidden FIXME?  Does this section even belong in the user manual?
address@hidden Seems more appropriate to the lispref?
address@hidden Disabling Multibyte
address@hidden Disabling Multibyte Characters
 
   By default, Emacs starts in multibyte mode: it stores the contents
 of buffers and strings using an internal encoding that represents
@@ -275,32 +276,48 @@
 @samp{raw-text} doesn't disable format conversion, uncompression, or
 auto mode selection.
 
address@hidden Not a single file in Emacs uses this feature.  Is it really worth
address@hidden mentioning in the _user_ manual?  Also, this duplicates somewhat
address@hidden "Loading Non-ASCII" from the lispref.
 @cindex Lisp files, and multibyte operation
 @cindex multibyte operation, and Lisp files
 @cindex unibyte operation, and Lisp files
 @cindex init file, and address@hidden characters
   Emacs normally loads Lisp files as multibyte.
 This includes the Emacs initialization
-file, @file{.emacs}, and the initialization files of Emacs packages
+file, @file{.emacs}, and the initialization files of packages
 such as Gnus.  However, you can specify unibyte loading for a
-particular Lisp file, by putting @address@hidden: t;-*-}} in a
-comment on the first line (@pxref{File Variables}).  Then that file is
-always loaded as unibyte text.  The motivation for these conventions
-is that it is more reliable to 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.
+particular Lisp file, by adding an entry @samp{unibyte: t} in a file
+local variables section (@pxref{File Variables}).  Then that file is
+always loaded as unibyte text.  Note that this does not represent a
+real @code{unibyte} variable, rather it just acts as an indicator
+to Emacs in the same way as @code{coding} does (@pxref{Specify Coding}).
address@hidden
address@hidden I don't see the point of this statement:
+The motivation for these conventions is that it is more reliable to
+always load any particular Lisp file in the same way.
address@hidden ignore
+Note also that this feature only applies to @emph{loading} Lisp files
+for evaluation, not to visiting them for editing.  You can also load a
+Lisp file as unibyte, on any one occasion, by typing @kbd{C-x
address@hidden 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) 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.
address@hidden Line}, for more details about this.
address@hidden See http://debbugs.gnu.org/11226 for lack of unibyte tooltip.
address@hidden enable-multibyte-characters
+The buffer-local variable @code{enable-multibyte-characters} is
address@hidden in multibyte buffers, and @code{nil} in unibyte ones.
+The mode line also indicates whether a buffer is multibyte or not.
address@hidden Line}.  With a graphical display, in a multibyte buffer,
+the portion of the mode line that indicates the character set has a
+tooltip that (amongst other things) says that the buffer is multibyte.
+In a unibyte buffer, the character set indicator is absent.  Thus, in
+a unibyte buffer (when using a graphical display) there is normally
+nothing before the indication of the visited file's end-of-line
+convention (colon, backslash, etc.), unless you are using an input
+method.
 
 @findex toggle-enable-multibyte-characters
-You can turn on multibyte support in a specific buffer by invoking the
+You can turn off multibyte support in a specific buffer by invoking the
 command @code{toggle-enable-multibyte-characters} in that buffer.
 
 @node Language Environments
@@ -1540,7 +1557,7 @@
 set-language-environment} and specify a suitable language environment
 such as @address@hidden
 
-  For more information about unibyte operation, see @ref{Enabling
+  For more information about unibyte operation, see @ref{Disabling
 Multibyte}.  Note particularly that you probably want to ensure that
 your initialization files are read as unibyte if they contain
 address@hidden characters.
@@ -1613,7 +1630,7 @@
 library is loaded, the @key{ALT} modifier key, if the keyboard has
 one, serves the same purpose as @kbd{C-x 8}: use @key{ALT} together
 with an accent character to modify the following letter.  In addition,
-if the keyboard has keys for the Latin-1 ``dead accent characters,''
+if the keyboard has keys for the Latin-1 ``dead accent characters'',
 they too are defined to compose with the following character, once
 @code{iso-transl} is loaded.
 

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2012-04-10 07:34:53 +0000
+++ b/doc/lispref/ChangeLog     2012-04-12 01:09:15 +0000
@@ -1,3 +1,7 @@
+2012-04-12  Glenn Morris  <address@hidden>
+
+       * loading.texi (Loading Non-ASCII): "unibyte:" can also be at the end.
+
 2012-04-10  Glenn Morris  <address@hidden>
 
        * strings.texi (Case Tables):

=== modified file 'doc/lispref/loading.texi'
--- a/doc/lispref/loading.texi  2012-04-08 02:07:16 +0000
+++ b/doc/lispref/loading.texi  2012-04-12 01:09:15 +0000
@@ -375,7 +375,7 @@
 inserting them in unibyte buffers converts them to unibyte
 automatically.  However, if this does make a difference, you can force
 a particular Lisp file to be interpreted as unibyte by writing
address@hidden: t;-*-} in a comment on the file's first line.  With
address@hidden: t} in a local variables section.  With
 that designator, the file will unconditionally be interpreted as
 unibyte, even in an ordinary multibyte Emacs session.  This can matter
 when making keybindings to address@hidden characters written as

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-04-11 21:41:58 +0000
+++ b/lisp/ChangeLog    2012-04-12 01:09:15 +0000
@@ -1,3 +1,7 @@
+2012-04-12  Glenn Morris  <address@hidden>
+
+       * international/mule.el (set-auto-coding-for-load): Doc fix.
+
 2012-04-11  Stefan Monnier  <address@hidden>
 
        * imenu.el (imenu-add-to-menubar): `current-local-map' can be nil.

=== modified file 'lisp/international/mule.el'
--- a/lisp/international/mule.el        2012-02-28 08:17:21 +0000
+++ b/lisp/international/mule.el        2012-04-12 01:09:15 +0000
@@ -1754,8 +1754,9 @@
   :type '(repeat function))
 
 (defvar set-auto-coding-for-load nil
-  "Non-nil means look for `load-coding' property instead of `coding'.
-This is used for loading and byte-compiling Emacs Lisp files.")
+  "Non-nil means respect a \"unibyte: t\" entry in file local variables.
+Emacs binds this variable to t when loading or byte-compiling Emacs Lisp
+files.")
 
 (defun auto-coding-alist-lookup (filename)
   "Return the coding system specified by `auto-coding-alist' for FILENAME."