diff options
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2010-07-05 18:58:31 +0900 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2010-07-05 18:58:31 +0900 |
| commit | 5a874e95ef18724f1658e10785baddaf6761cfd7 (patch) | |
| tree | 749c731920e335a40ac88dc0ac3037eb99df3e23 /src/nsterm.m | |
| parent | 0682186e3a4c8d1806e75fb357f2bc244a526183 (diff) | |
| download | emacs-5a874e95ef18724f1658e10785baddaf6761cfd7.tar.gz | |
Fix ghost buffer boundary indicators in fringes (Bug#5634, Bug#6325).
* dispextern.h (FRINGE_HEIGHT_BITS): New define.
(struct glyph_row): New members left_fringe_offset and
right_fringe_offset.
* xterm.c (x_draw_fringe_bitmap): Don't clip bottom aligned bitmap
specially.
* w32term.c (w32_draw_fringe_bitmap): Likewise.
* nsterm.m (ns_draw_fringe_bitmap): Likewise.
* fringe.c (draw_fringe_bitmap_1): Don't clip bitmap here.
Take account of bitmap offset.
(draw_window_fringes): Take account of window vscroll.
(update_window_fringes): Likewise. Extend top-aligned top indicator
or bottom-aligned bottom indicator to adjacent rows if it doesn't fit
in one row. Don't set redraw_fringe_bitmaps_p outside row comparison.
Set left_fringe_offset and right_fringe_offset (Bug#5634, Bug#6325).
Diffstat (limited to 'src/nsterm.m')
| -rw-r--r-- | src/nsterm.m | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/nsterm.m b/src/nsterm.m index 7bc82e96104..7c70b2ae698 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -2177,20 +2177,7 @@ ns_draw_fringe_bitmap (struct window *w, struct glyph_row *row, /* Must clip because of partially visible lines. */ rowY = WINDOW_TO_FRAME_PIXEL_Y (w, row->y); - if (p->y < rowY) - { - /* Adjust position of "bottom aligned" bitmap on partially - visible last row. */ - int oldY = row->y; - int oldVH = row->visible_height; - row->visible_height = p->h; - row->y -= rowY - p->y; - ns_clip_to_row (w, row, -1, NO); - row->y = oldY; - row->visible_height = oldVH; - } - else - ns_clip_to_row (w, row, -1, YES); + ns_clip_to_row (w, row, -1, YES); if (p->bx >= 0 && !p->overlay_p) { |