Merged in changes from CVS trunk.

Patches applied:

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

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

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

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-571
   Merge from gnus--rel--5.10

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

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

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-575
   Merge from gnus--rel--5.10

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

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

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

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-580
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-31
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-32
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-33
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-34
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-35
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-36
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-37
   Update from CVS


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

1 files changed, 13 insertions, 9 deletions

diff --git a/src/buffer.c b/src/buffer.c
index b1c453816ce..b0368a842ca 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5682,16 +5682,20 @@ If non-nil, the first and last line of the buffer are marked in the fringe
 of a window on window-systems with angle bitmaps, or if the window can be
 scrolled, the top and bottom line of the window are marked with up and down
 arrow bitmaps.
-If value is `left' or `right', both angle and arrow bitmaps are displayed in
-the left or right fringe, resp.  Any other non-nil value causes the
-bitmap on the top line to be displayed in the left fringe, and the
-bitmap on the bottom line in the right fringe.
-If value is a cons (ANGLES . ARROWS), the car specifies the position
-of the angle bitmaps, and the cdr specifies the position of the arrow
-bitmaps.  For example, (t . right) places the top angle bitmap in left
-fringe, the bottom angle bitmap in right fringe, and both arrow
+
+If value is a symbol `left' or `right', both angle and arrow bitmaps
+are displayed in the left or right fringe, resp.
+
+If value is an alist, each element (INDICATOR . POSITION) specifies
+the position of one of the indicators.  INDICATOR is one of `top',
+`bottom', `up', `down', or t, which specifies the default position,
+and POSITION is one of `left', `right', or nil, meaning do not show
+this indicator.
+
+For example, ((top . left) (t . right)) places the top angle bitmap in
+left fringe, the bottom angle bitmap in right fringe, and both arrow
 bitmaps in right fringe.  To show just the angle bitmaps in the left
-fringe, but no arrow bitmaps, use (left . nil).  */);
+fringe, but no arrow bitmaps, use ((top .  left) (bottom . left)).  */);
 
   DEFVAR_PER_BUFFER ("scroll-up-aggressively",
                      &current_buffer->scroll_up_aggressively, Qnil,