Merge in revno 100770

[Eli Zaretskii]

This merge from the emacs-23 branch:

  100770: Chong Yidong 2010-07-10 [merge] Merge changes from emacs-23 branch.

somehow managed to revert changes I did in fringe.c for bidi-aware
display of continuation bitmaps on the fringes (because obviously,
there's no such code on the branch).  Specifically, it was due to the
merge of this bugfix commit on the branch:

  99634.2.281: YAMAMOTO Mitsuharu 2010-07-05 Fix ghost buffer boundary
               indicators in fringes (Bug#5634, Bug#6325).

Do we know how could that happen?  Was that some snafu during manual
resolution of text conflicts, or a problem in Bazaar's automatic
merges?

For the record, the changes that were reverted are these, which were
part of a merge-commit I did in revno 99950 on the trunk:

  === modified file 'src/fringe.c'
  --- src/fringe.c      2010-04-10 16:28:30 +0000
  +++ src/fringe.c      2010-04-17 12:33:05 +0000
  @@ -1090,7 +1090,8 @@ update_window_fringes (w, keep_current_p
                  : LEFT_FRINGE (2, Qtop, 0));
         else if (row->indicate_eob_p && EQ (boundary_bot, Qleft))
          left = LEFT_FRINGE (3, Qbottom, row->ends_at_zv_p);
  -      else if (MATRIX_ROW_CONTINUATION_LINE_P (row))
  +      else if ((!row->reversed_p && MATRIX_ROW_CONTINUATION_LINE_P (row))
  +            || (row->reversed_p && row->continued_p))
          left = LEFT_FRINGE (4, Qcontinuation, 0);
         else if (row->indicate_empty_line_p && EQ (empty_pos, Qleft))
          left = LEFT_FRINGE (5, Qempty_line, 0);
  @@ -1117,7 +1118,8 @@ update_window_fringes (w, keep_current_p
                   : RIGHT_FRINGE (2, Qtop, 0));
         else if (row->indicate_eob_p && EQ (boundary_bot, Qright))
          right = RIGHT_FRINGE (3, Qbottom, row->ends_at_zv_p);
  -      else if (row->continued_p)
  +      else if ((!row->reversed_p && row->continued_p)
  +            || (row->reversed_p && MATRIX_ROW_CONTINUATION_LINE_P (row)))
          right = RIGHT_FRINGE (4, Qcontinuation, 0);
         else if (row->indicate_top_line_p && EQ (arrow_top, Qright))
          right = RIGHT_FRINGE (6, Qup, 0);