[Emacs-diffs] Changes to emacs/src/xdisp.c

[Kim F . Storm]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.919 emacs/src/xdisp.c:1.920
*** emacs/src/xdisp.c:1.919     Fri Oct 15 12:02:27 2004
--- emacs/src/xdisp.c   Sun Oct 17 13:17:00 2004
***************
*** 9523,9533 ****
  }
  
  
! /* Return overlay arrow string at row, or nil.  */
  
  static Lisp_Object
! overlay_arrow_at_row (f, row, pbitmap)
!      struct frame *f;
       struct glyph_row *row;
       int *pbitmap;
  {
--- 9523,9535 ----
  }
  
  
! /* Return overlay arrow string to display at row.
!    Return t if display as bitmap in left fringe.
!    Return nil if no overlay arrow.  */
  
  static Lisp_Object
! overlay_arrow_at_row (it, row, pbitmap)
!      struct it *it;
       struct glyph_row *row;
       int *pbitmap;
  {
***************
*** 9550,9558 ****
          && (MATRIX_ROW_START_CHARPOS (row) == marker_position (val)))
        {
          val = overlay_arrow_string_or_property (var, pbitmap);
!         if (FRAME_WINDOW_P (f))
            return Qt;
!         else if (STRINGP (val))
            return val;
          break;
        }
--- 9552,9561 ----
          && (MATRIX_ROW_START_CHARPOS (row) == marker_position (val)))
        {
          val = overlay_arrow_string_or_property (var, pbitmap);
!         if (FRAME_WINDOW_P (it->f)
!             && WINDOW_LEFT_FRINGE_WIDTH (it->w) > 0)
            return Qt;
!         if (STRINGP (val))
            return val;
          break;
        }
***************
*** 14073,14080 ****
                     Building Desired Matrix Rows
   ***********************************************************************/
  
! /* Return a temporary glyph row holding the glyphs of an overlay
!    arrow.  Only used for non-window-redisplay windows.  */
  
  static struct glyph_row *
  get_overlay_arrow_glyph_row (w, overlay_arrow_string)
--- 14076,14083 ----
                     Building Desired Matrix Rows
   ***********************************************************************/
  
! /* Return a temporary glyph row holding the glyphs of an overlay arrow.
!    Used for non-window-redisplay windows, and for windows w/o left fringe.  */
  
  static struct glyph_row *
  get_overlay_arrow_glyph_row (w, overlay_arrow_string)
***************
*** 14955,14965 ****
       better to let it be displayed like cursors under X.  */
    if (! overlay_arrow_seen
        && (overlay_arrow_string
!           = overlay_arrow_at_row (it->f, row, &overlay_arrow_bitmap),
          !NILP (overlay_arrow_string)))
      {
        /* Overlay arrow in window redisplay is a fringe bitmap.  */
!       if (!FRAME_WINDOW_P (it->f))
        {
          struct glyph_row *arrow_row
            = get_overlay_arrow_glyph_row (it->w, overlay_arrow_string);
--- 14958,14968 ----
       better to let it be displayed like cursors under X.  */
    if (! overlay_arrow_seen
        && (overlay_arrow_string
!           = overlay_arrow_at_row (it, row, &overlay_arrow_bitmap),
          !NILP (overlay_arrow_string)))
      {
        /* Overlay arrow in window redisplay is a fringe bitmap.  */
!       if (STRINGP (overlay_arrow_string))
        {
          struct glyph_row *arrow_row
            = get_overlay_arrow_glyph_row (it->w, overlay_arrow_string);
***************
*** 14984,14993 ****
              row->used[TEXT_AREA] = p2 - row->glyphs[TEXT_AREA];
            }
        }
! 
        overlay_arrow_seen = 1;
-       it->w->overlay_arrow_bitmap = overlay_arrow_bitmap;
-       row->overlay_arrow_p = 1;
      }
  
    /* Compute pixel dimensions of this line.  */
--- 14987,14998 ----
              row->used[TEXT_AREA] = p2 - row->glyphs[TEXT_AREA];
            }
        }
!       else
!       {
!         it->w->overlay_arrow_bitmap = overlay_arrow_bitmap;
!         row->overlay_arrow_p = 1;
!       }
        overlay_arrow_seen = 1;
      }
  
    /* Compute pixel dimensions of this line.  */