Merge from emacs-23; up to 2010-06-12T11:17:12Z!eliz@gnu.org.

diff --cc doc/lispref/ChangeLog
index ce3521b,fd8a994..bd92b2a
--- 1/doc/lispref/ChangeLog
--- 2/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@@ -1,63 -1,21 +1,80 @@@
 -2011-05-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 2011-05-29  Chong Yidong  <cyd@stupidchicken.com>
+ 
+       * help.texi (Accessing Documentation):
+       * display.texi (Pixel Specification):
+       * processes.texi (Serial Ports, Serial Ports):
+       * nonascii.texi (Character Properties, Default Coding Systems):
+       * text.texi (Changing Properties, Special Properties):
+       * windows.texi (Window Start and End):
+       * modes.texi (SMIE Indentation Example, SMIE Tricks):
+       * keymaps.texi (Searching Keymaps, Tool Bar):
+       * minibuf.texi (Basic Completion):
+       * compile.texi (Eval During Compile):
+       * strings.texi (Formatting Strings): Tweaks to avoid overflowing
+       7x9 paper in printed manual.
+ 
+       * lists.texi (Sets And Lists): Fix misplaced text.
+ 
 +2011-05-29  Chong Yidong  <cyd@stupidchicken.com>
 +
 +      * keymaps.texi (Remapping Commands): Emphasize that the keymap
 +      needs to be active (Bug#8350).
 +
 +2011-05-28  Chong Yidong  <cyd@stupidchicken.com>
 +
 +      * minibuf.texi (Reading File Names): Clarify (Bug#8480).
 +
 +      * tips.texi (Coding Conventions): Remove antediluvian filename
 +      limit recommendation (Bug#8538).
 +
 +2011-05-27  Glenn Morris  <rgm@gnu.org>
 +
 +      * modes.texi (Auto Major Mode): Update for set-auto-mode changes.
 +
 +2011-05-26  Glenn Morris  <rgm@gnu.org>
 +
 +      * variables.texi (File Local Variables):
 +      Update hack-local-variables `mode-only' return value.
 +      Add some more details on what this function does in the other case.
 +
 +2011-05-19  Glenn Morris  <rgm@gnu.org>
 +
 +      * lists.texi (Sets And Lists): Mention cl provides union etc.
 +
 +2011-05-19  Nix  <nix@esperi.org.uk>
 +
 +      * windows.texi (Displaying Buffers): pop-to-buffer is not a command.
 +
 +      * text.texi (Parsing HTML): Update for function name changes.
 +
 +      * syntax.texi (Syntax Flags): Small fix.
 +
 +      * keymaps.texi (Active Keymaps): Typo fix.
 +      (Changing Key Bindings): Grammar fix.
 +
 +      * frames.texi (Minibuffers and Frames): Grammar fix.
 +      (Window System Selections): x-select-enable-clipboard now defaults to t.
 +
 +      * customize.texi (Common Keywords):
 +      * display.texi (Abstract Display):
 +      * modes.texi (Auto-Indentation):
 +      * nonascii.texi (Converting Representations): Typo fixes.
 +
 +      * control.texi (Examples of Catch): Call it "goto" not "go to".
 +
 +2011-05-14  Eli Zaretskii  <eliz@gnu.org>
 +
 +      * nonascii.texi (Character Properties): Fix inconsistencies with
 +      implementation.
 +
 +      * text.texi (Special Properties): Move @defvar's out of the
 +      @table.  (Bug#8652)
 +
 +2011-05-12  Glenn Morris  <rgm@gnu.org>
 +
 +      * display.texi (Image Descriptors): Fix typo.  (Bug#8495)
 +
 +2011-05-12  Stefan Monnier  <monnier@iro.umontreal.ca>
  
        * modes.texi (Region to Refontify): Rename from "Region to Fontify".
        (Multiline Font Lock):

diff --cc doc/lispref/compile.texi
Simple merge

diff --cc doc/lispref/display.texi
Simple merge

diff --cc doc/lispref/elisp.texi
Simple merge

diff --cc doc/lispref/help.texi
Simple merge

diff --cc doc/lispref/keymaps.texi
Simple merge

diff --cc doc/lispref/lists.texi
Simple merge

diff --cc doc/lispref/minibuf.texi
Simple merge

diff --cc doc/lispref/modes.texi
Simple merge

diff --cc doc/lispref/nonascii.texi
index 0328dae,b66a544..7733789
--- 1/doc/lispref/nonascii.texi
--- 2/doc/lispref/nonascii.texi
+++ b/doc/lispref/nonascii.texi
@@@ -374,18 -378,17 +374,18 @@@ properties that Emacs knows about
  
  @table @code
  @item name
- This property corresponds to the Unicode @code{Name} property.  The
- value is a string consisting of upper-case Latin letters A to Z,
- digits, spaces, and hyphen @samp{-} characters.
+ Corresponds to the @code{Name} Unicode property.  The value is a
+ string consisting of upper-case Latin letters A to Z, digits, spaces,
+ and hyphen @samp{-} characters.
  
 +@cindex unicode general category
  @item general-category
- This property corresponds to the Unicode @code{General_Category}
- property.  The value is a symbol whose name is a 2-letter abbreviation
- of the character's classification.
+ Corresponds to the @code{General_Category} Unicode property.  The
+ value is a symbol whose name is a 2-letter abbreviation of the
+ character's classification.
  
  @item canonical-combining-class
- Corresponds to the Unicode @code{Canonical_Combining_Class} property.
+ Corresponds to the @code{Canonical_Combining_Class} Unicode property.
  The value is an integer number.
  
  @item bidi-class
@@@ -470,12 -474,14 +471,14 @@@ This function returns the value of @var
       @result{} 4
  @end group
  @group
- (get-char-code-property ?\u2155 'numeric-value) ; one fifth
+ ;; one fifth
+ (get-char-code-property ?\u2155 'numeric-value)
 -     @result{} 1/5
 +     @result{} 0.2
  @end group
  @group
- (get-char-code-property ?\u2163 'numeric-value) ; Roman IV
+ ;; Roman IV
+ (get-char-code-property ?\u2163 'numeric-value)
 -     @result{} \4
 +     @result{} 4
  @end group
  @end example
  @end defun

diff --cc doc/lispref/processes.texi
Simple merge

diff --cc doc/lispref/strings.texi
Simple merge

diff --cc doc/lispref/text.texi
Simple merge

diff --cc doc/lispref/tips.texi
Simple merge

diff --cc doc/lispref/windows.texi
Simple merge