diff options
| author | Kim F. Storm | 2004-03-03 09:02:50 +0000 |
|---|---|---|
| committer | Kim F. Storm | 2004-03-03 09:02:50 +0000 |
| commit | 7d90b5870ba07a5df6043f660e753484722bb0d0 (patch) | |
| tree | 80f5d4ad57fa66383dc0e6663d2145d5c1a00c75 /src | |
| parent | 6c2488df0c41c84df0389e65d2481d3d08eec796 (diff) | |
| download | emacs-7d90b5870ba07a5df6043f660e753484722bb0d0.tar.gz emacs-7d90b5870ba07a5df6043f660e753484722bb0d0.zip | |
(display_line): Fix call to get_overlay_arrow_glyph_row.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xdisp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index 7fbe6c1b930..fb66bf0beb0 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -9420,15 +9420,15 @@ update_overlay_arrows (up_to_date) | |||
| 9420 | vlist = XCDR (vlist)) | 9420 | vlist = XCDR (vlist)) |
| 9421 | { | 9421 | { |
| 9422 | Lisp_Object var = XCAR (vlist); | 9422 | Lisp_Object var = XCAR (vlist); |
| 9423 | Lisp_Object val; | ||
| 9424 | 9423 | ||
| 9425 | if (!SYMBOLP (var)) | 9424 | if (!SYMBOLP (var)) |
| 9426 | continue; | 9425 | continue; |
| 9427 | 9426 | ||
| 9428 | if (up_to_date) | 9427 | if (up_to_date) |
| 9429 | { | 9428 | { |
| 9429 | Lisp_Object val = find_symbol_value (var); | ||
| 9430 | Fput (var, Qlast_arrow_position, | 9430 | Fput (var, Qlast_arrow_position, |
| 9431 | COERCE_MARKER (find_symbol_value (var))); | 9431 | COERCE_MARKER (val)); |
| 9432 | Fput (var, Qlast_arrow_string, | 9432 | Fput (var, Qlast_arrow_string, |
| 9433 | overlay_arrow_string_or_property (var, 0)); | 9433 | overlay_arrow_string_or_property (var, 0)); |
| 9434 | } | 9434 | } |
| @@ -14749,15 +14749,15 @@ display_line (it) | |||
| 14749 | This is clearly a mess with variable size fonts. It would be | 14749 | This is clearly a mess with variable size fonts. It would be |
| 14750 | better to let it be displayed like cursors under X. */ | 14750 | better to let it be displayed like cursors under X. */ |
| 14751 | if (! overlay_arrow_seen | 14751 | if (! overlay_arrow_seen |
| 14752 | && (overlay_arrow_string = overlay_arrow_at_row (it->f, row, | 14752 | && (overlay_arrow_string |
| 14753 | &overlay_arrow_bitmap), | 14753 | = overlay_arrow_at_row (it->f, row, &overlay_arrow_bitmap), |
| 14754 | !NILP (overlay_arrow_string))) | 14754 | !NILP (overlay_arrow_string))) |
| 14755 | { | 14755 | { |
| 14756 | /* Overlay arrow in window redisplay is a fringe bitmap. */ | 14756 | /* Overlay arrow in window redisplay is a fringe bitmap. */ |
| 14757 | if (!FRAME_WINDOW_P (it->f)) | 14757 | if (!FRAME_WINDOW_P (it->f)) |
| 14758 | { | 14758 | { |
| 14759 | struct glyph_row *arrow_row | 14759 | struct glyph_row *arrow_row |
| 14760 | = get_overlay_arrow_glyph_row (it->w, overlay_arrow_bitmap); | 14760 | = get_overlay_arrow_glyph_row (it->w, overlay_arrow_string); |
| 14761 | struct glyph *glyph = arrow_row->glyphs[TEXT_AREA]; | 14761 | struct glyph *glyph = arrow_row->glyphs[TEXT_AREA]; |
| 14762 | struct glyph *arrow_end = glyph + arrow_row->used[TEXT_AREA]; | 14762 | struct glyph *arrow_end = glyph + arrow_row->used[TEXT_AREA]; |
| 14763 | struct glyph *p = row->glyphs[TEXT_AREA]; | 14763 | struct glyph *p = row->glyphs[TEXT_AREA]; |