Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-566
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-250

4 files changed, 19 insertions, 9 deletions

diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index b6819c9b16c..2dd35cd1844 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,11 @@
+2004-09-22  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * display.texi: Correct various typos.
+        (Display): Rename node "Pointer Shapes" to "Pointer
+        Shape".  (There is already a node called "Pointer Shapes" in
+        frames.texi.)
+        (Images): Remove non-existent node "Image Slices" from menu.
+
 2004-09-23  Kim F. Storm  <storm@cua.dk>
 
         * text.texi (Special Properties): Add `cursor', `pointer',
diff --git a/lispref/display.texi b/lispref/display.texi
index f5923acd3f5..3f75c386765 100644
--- a/lispref/display.texi
+++ b/lispref/display.texi
@@ -25,9 +25,9 @@ that Emacs presents to the user.
 * Faces::               A face defines a graphics style for text characters:
                           font, colors, etc.
 * Fringes::             Controlling window fringes.
-* Fringe Bitmaps::     Customizing fringe bitmaps.
+* Fringe Bitmaps::      Customizing fringe bitmaps.
 * Scroll Bars::         Controlling vertical scroll bars.
-* Pointer Shapes::      Controlling the mouse pointer shape.
+* Pointer Shape::       Controlling the mouse pointer shape.
 * Display Property::    Enabling special display features.
 * Images::              Displaying images in Emacs buffers.
 * Buttons::             Adding clickable buttons to Emacs buffers.
@@ -2786,8 +2786,8 @@ in a buffer that is already visible in a window, you can make the
 window take note of the new values by calling @code{set-window-buffer}
 specifying the same buffer that is already displayed.
 
-@node Pointer Shapes
-@section Pointer Shapes
+@node Pointer Shape
+@section Pointer Shape
 
 Normally, the mouse pointer has the @code{text} shape over text and
 the @code{arrow} shape over window areas which do not correspond to
@@ -2921,7 +2921,7 @@ used as an absolute number of pixels.
 @end example
 
   The form @var{NUM} specifies a fractional width or height of the
-default frame font size.  The form @code(@var{NUM})} specifies an
+default frame font size.  The form @code{(@var{NUM})} specifies an
 absolute number of pixels.  If a symbol @var{SYMBOL} is specified, its
 buffer-local variable binding is used.
 
@@ -2955,7 +2955,7 @@ the left-margin, use
 to the left edge of the text area.  For example, @samp{:align-to 0} in a
 header-line aligns with the first text column in the text area.
 
-  The value of the form @code(@var{NUM} . @var{EXPR})} is the value of
+  The value of the form @code{(@var{NUM} . @var{EXPR})} is the value of
 @var{NUM} multiplied by the value of the expression @var{EXPR}.  For
 example, @samp{(2 . in)} specifies a width of 2 inches, while
 @samp{(0.5 . IMAGE)} specifies half the width (or height) of the
@@ -3227,7 +3227,6 @@ function always returns @code{t}; for other image types, it returns
 * Other Image Types::   Various other formats are supported.
 * Defining Images::     Convenient ways to define an image for later use.
 * Showing Images::      Convenient ways to display an image once it is defined.
-* Image Slices::        Displaying image slices.
 * Image Cache::         Internal mechanisms of image display.
 @end menu
 
@@ -3413,7 +3412,7 @@ which specifies the center and the radius of the circle; @var{r} may
 be a float or integer.
 
 A polygon is a cons
-@code(poly . [@var{x0} @var{y0} @var{x1} @var{y1} ...])}
+@code{(poly . [@var{x0} @var{y0} @var{x1} @var{y1} ...])}
 where each pair in the vector describes one corner in the polygon.
 
 When the mouse pointer is above a hot-spot area of an image, the
diff --git a/man/ChangeLog b/man/ChangeLog
index 10320ef7de7..7b20cda2bc0 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-22  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * display.texi (Display Custom): Remove stray `@end defvar'.
+
 2004-09-23  Kim F. Storm  <storm@cua.dk>
 
         * display.texi (Display Custom): Add `overflow-newline-into-fringe',
diff --git a/man/display.texi b/man/display.texi
index ad3f0dfcd00..7d5e8ef84e0 100644
--- a/man/display.texi
+++ b/man/display.texi
@@ -998,7 +998,6 @@ character) shall not be broken into two lines on the display (with
 just the newline on the second line).  Instead, the newline
 overflows into the right fringe, and the cursor will be displayed in
 the fringe when positioned on that newline.
-@end defvar
 
 @vindex indicate-buffer-boundaries
   On a window system, Emacs may indicate the buffer boundaries in the