diff options
author | Chong Yidong <cyd@stupidchicken.com> | 2010-07-10 14:52:53 -0400 |
---|---|---|
committer | Chong Yidong <cyd@stupidchicken.com> | 2010-07-10 14:52:53 -0400 |
commit | 2ec1b5ee3464999a18b8197101e8bf08a3c564a8 (patch) | |
tree | 4837c369ac576fbfd063b1ff046a3daca372f082 /src/w32term.c | |
parent | c971758df75640c55e6f9d7ac7d9c6909519d0b4 (diff) | |
parent | 7c33a0572280bdcf0583c5625cfda32f63fad56d (diff) | |
download | emacs-2ec1b5ee3464999a18b8197101e8bf08a3c564a8.tar.gz |
Merge changes from emacs-23 branch.
Diffstat (limited to 'src/w32term.c')
-rw-r--r-- | src/w32term.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/w32term.c b/src/w32term.c index 7ace4b01f95..9db533eb5e9 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -737,7 +737,6 @@ w32_draw_fringe_bitmap (struct window *w, struct glyph_row *row, struct frame *f = XFRAME (WINDOW_FRAME (w)); HDC hdc; struct face *face = p->face; - int rowY; hdc = get_frame_dc (f); @@ -796,21 +795,7 @@ w32_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; - w32_clip_to_row (w, row, -1, hdc); - row->y = oldY; - row->visible_height = oldVH; - } - else - w32_clip_to_row (w, row, -1, hdc); + w32_clip_to_row (w, row, -1, hdc); if (p->which && p->which < max_fringe_bmp) { |